December 2010 - Wine-commits

Alexandre Julliard : wine.inf: Don' t set the ProgramFiles environment variables through the registry.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: bb80fdf744192af33cb542e075f7dcaba382f422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb80fdf744192af33cb542e07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 22:49:01 2010 +0100 wine.inf: Don't set the ProgramFiles environment variables through the registry. --- tools/wine.inf.in | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 57ecddb..aa3b354 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -565,11 +565,9 @@ HKLM,%Control%\Session Manager,HeapDeCommitFreeBlockThreshold,0x00040002,0 HKLM,%Control%\Session Manager,HeapDeCommitTotalFreeThreshold,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentCommit,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentReserve,0x00040002,0 -HKLM,%Control%\Session Manager\Environment,"CommonProgramFiles",,"%16427%" HKLM,%Control%\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" HKLM,%Control%\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" -HKLM,%Control%\Session Manager\Environment,"ProgramFiles",,"%16422%" HKLM,%Control%\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,%Control%\Session Manager\Environment,"SYSTEMROOT",,"%10%" HKLM,%Control%\Session Manager\Environment,"TEMP",0x00020002,"%10%\temp"

1 0

Henri Verbeet : wined3d: Pass implementation pointers to get_glsl_program_entry().
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: c492ec196e4e8984ffc0068fb244315dec3756ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c492ec196e4e8984ffc0068fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 14 18:30:58 2010 +0100 wined3d: Pass implementation pointers to get_glsl_program_entry(). --- dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6d1b86..6062231 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3703,13 +3703,14 @@ static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_sh } static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_priv *priv, - IWineD3DVertexShader *vshader, IWineD3DPixelShader *pshader, struct vs_compile_args *vs_args, - struct ps_compile_args *ps_args) { + IWineD3DVertexShaderImpl *vshader, IWineD3DPixelShaderImpl *pshader, + struct vs_compile_args *vs_args, struct ps_compile_args *ps_args) +{ struct wine_rb_entry *entry; glsl_program_key_t key; - key.vshader = (IWineD3DVertexShaderImpl *)vshader; - key.pshader = (IWineD3DPixelShaderImpl *)pshader; + key.vshader = vshader; + key.pshader = pshader; key.vs_args = *vs_args; key.ps_args = *ps_args; @@ -4302,8 +4303,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, if (vshader) find_vs_compile_args(state, vshader, &vs_compile_args); if (pshader) find_ps_compile_args(state, pshader, &ps_compile_args); - entry = get_glsl_program_entry(priv, (IWineD3DVertexShader *)vshader, (IWineD3DPixelShader *)pshader, - &vs_compile_args, &ps_compile_args); + entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); if (entry) { priv->glsl_program = entry;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_get_registers_used().
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 51f06dcf0c7d65bae6f88fefc6f8741a99d5b5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f06dcf0c7d65bae6f88fefc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 14 18:30:59 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_get_registers_used(). --- dlls/wined3d/shader.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 31ece02..0a0aae8 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -448,11 +448,10 @@ static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HAN } /* Note that this does not count the loop register as an address register. */ -static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, +static HRESULT shader_get_registers_used(IWineD3DBaseShaderImpl *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature_element *input_signature, struct wined3d_shader_signature_element *output_signature, const DWORD *byte_code, DWORD constf_size) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; unsigned int cur_loop_depth = 0, max_loop_depth = 0; void *fe_data = shader->baseShader.frontend_data; struct wined3d_shader_version shader_version; @@ -1607,7 +1606,7 @@ static HRESULT shader_set_function(IWineD3DBaseShaderImpl *shader, const DWORD * list_init(&shader->baseShader.constantsI); /* Second pass: figure out which registers are used, what the semantics are, etc. */ - hr = shader_get_registers_used((IWineD3DBaseShader *)shader, fe, + hr = shader_get_registers_used(shader, fe, reg_maps, shader->baseShader.input_signature, shader->baseShader.output_signature, byte_code, float_const_count); if (FAILED(hr)) return hr;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_generate_main().
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 2f36d600ef7c4c13af08ac2f9cd4db3763369866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f36d600ef7c4c13af08ac2f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 14 18:31:00 2010 +0100 wined3d: Pass an IWineD3DBaseShaderImpl pointer to shader_generate_main(). --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 5 ++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1526e70..3bcb71b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3771,7 +3771,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); + shader_generate_main((IWineD3DBaseShaderImpl *)This, buffer, reg_maps, function, &priv_ctx); if(args->super.srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2], srgbtmp[3], @@ -4182,7 +4182,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, /* The shader starts with the main function */ priv_ctx.in_main_func = TRUE; /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); + shader_generate_main((IWineD3DBaseShaderImpl *)This, buffer, reg_maps, function, &priv_ctx); if (!priv_ctx.footer_written) vshader_add_footer(&priv_ctx, shader_data, args, reg_maps, gl_info, buffer); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6062231..45d098b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4004,7 +4004,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); + shader_generate_main((IWineD3DBaseShaderImpl *)This, buffer, reg_maps, function, &priv_ctx); /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ if (reg_maps->shader_version.major < 2) @@ -4089,7 +4089,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_generate_glsl_declarations(context, buffer, (IWineD3DBaseShaderImpl *)This, reg_maps, &priv_ctx); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, &priv_ctx); + shader_generate_main((IWineD3DBaseShaderImpl *)This, buffer, reg_maps, function, &priv_ctx); /* Unpack outputs */ shader_addline(buffer, "order_ps_input(OUT);\n"); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0a0aae8..ef25a0c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1162,10 +1162,9 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, /* Shared code in order to generate the bulk of the shader string. * NOTE: A description of how to parse tokens can be found on MSDN. */ -void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffer *buffer, +void shader_generate_main(IWineD3DBaseShaderImpl *shader, struct wined3d_shader_buffer *buffer, const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)iface; IWineD3DDeviceImpl *device = shader->baseShader.device; const struct wined3d_shader_frontend *fe = shader->baseShader.frontend; void *fe_data = shader->baseShader.frontend_data; @@ -1186,7 +1185,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffe loop_state.current_depth = 0; loop_state.current_reg = 0; - ctx.shader = iface; + ctx.shader = (IWineD3DBaseShader *)shader; ctx.gl_info = &device->adapter->gl_info; ctx.reg_maps = reg_maps; ctx.buffer = buffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6769956..6f30716 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2782,7 +2782,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, const struct wined3d_shader_version *shader_version) DECLSPEC_HIDDEN; unsigned int shader_find_free_input_register(const struct wined3d_shader_reg_maps *reg_maps, unsigned int max) DECLSPEC_HIDDEN; -void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffer *buffer, +void shader_generate_main(IWineD3DBaseShaderImpl *shader, struct wined3d_shader_buffer *buffer, const struct wined3d_shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx) DECLSPEC_HIDDEN; BOOL shader_match_semantic(const char *semantic_name, WINED3DDECLUSAGE usage) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Store an IWineD3DBaseShaderImpl pointer in wined3d_shader_context.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: bd2e7aedcf51b7dc48b5d1fd2d0f140d94b676af URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd2e7aedcf51b7dc48b5d1fd2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 14 18:31:01 2010 +0100 wined3d: Store an IWineD3DBaseShaderImpl pointer in wined3d_shader_context. --- dlls/wined3d/arb_program_shader.c | 18 +++++++++--------- dlls/wined3d/glsl_shader.c | 24 ++++++++++++------------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd2e7aedcf51b7dc48b5d…

1 0

André Hentschel : shell32: Fix shelllink test to not crash on NT4.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: c0a86cc103923595308111f62c94c9c0aa126c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a86cc103923595308111f62… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 14 14:05:25 2010 +0100 shell32: Fix shelllink test to not crash on NT4. With much help from Francois. --- dlls/shell32/tests/shelllink.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 2277e5e..f213221 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -168,15 +168,15 @@ static void test_get_set(void) CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&slW); - if (!slW) - skip("SetPath with NULL parameter crashes on Win9x\n"); + if (!slW /* Win9x */ || !pGetLongPathNameA /* NT4 */) + skip("SetPath with NULL parameter crashes on Win9x and some NT4\n"); else { IShellLinkW_Release(slW); r = IShellLinkA_SetPath(sl, NULL); ok(r==E_INVALIDARG || broken(r==S_OK), /* Some Win95 and NT4 */ - "SetPath failed (0x%08x)\n", r); + "SetPath returned wrong error (0x%08x)\n", r); } r = IShellLinkA_SetPath(sl, ""); @@ -808,11 +808,16 @@ static void test_datalink(void) ok( r == E_FAIL, "CopyDataBlock failed\n"); ok( dar == NULL, "should be null\n"); - r = IShellLinkW_SetPath(sl, NULL); - ok(r == E_INVALIDARG, "set path failed\n"); + if (!pGetLongPathNameA /* NT4 */) + skip("SetPath with NULL parameter crashes on NT4\n"); + else + { + r = IShellLinkW_SetPath(sl, NULL); + ok(r == E_INVALIDARG, "SetPath returned wrong error (0x%08x)\n", r); + } r = IShellLinkW_SetPath(sl, lnk); - ok(r == S_OK, "set path failed\n"); + ok(r == S_OK, "SetPath failed\n"); if (0) {

1 0

André Hentschel : shdocvw: Add Resizer control to the iexplore window.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: e8a766b4bf2e07ccb66d206908204d3710a88b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a766b4bf2e07ccb66d20690… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 14 15:30:44 2010 +0100 shdocvw: Add Resizer control to the iexplore window. --- dlls/shdocvw/iexplore.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index fb873f5..745cb17 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -488,7 +488,8 @@ static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) This->menu = create_ie_menu(); - This->status_hwnd = CreateStatusWindowW(CCS_NODIVIDER|WS_CHILD|WS_VISIBLE, NULL, hwnd, IDC_BROWSE_STATUSBAR); + This->status_hwnd = CreateStatusWindowW(WS_VISIBLE|WS_CHILD|SBT_NOBORDERS|CCS_NODIVIDER, + NULL, hwnd, IDC_BROWSE_STATUSBAR); SendMessageW(This->status_hwnd, SB_SIMPLE, TRUE, 0); create_rebar(hwnd);

1 0

Michael Stefaniuc : shlwapi/tests: Standardize the COM usage in ordinal.c.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 26de0e62027b65562dcf44ac80778d953adb3865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26de0e62027b65562dcf44ac8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:02:58 2010 +0100 shlwapi/tests: Standardize the COM usage in ordinal.c. --- dlls/shlwapi/tests/ordinal.c | 113 ++++++++++++++++++++++++++--------------- 1 files changed, 72 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26de0e62027b65562dcf4…

1 0

Michael Stefaniuc : oleaut32/tests: Use an iface instead of an vtbl pointer in IRecordInfoImpl.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 6c94cdc90345dfa000fb59ce61a1b053dd404867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c94cdc90345dfa000fb59ce6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 14 12:02:45 2010 +0100 oleaut32/tests: Use an iface instead of an vtbl pointer in IRecordInfoImpl. --- dlls/oleaut32/tests/safearray.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 29e8761..7c16ef7 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -25,6 +25,7 @@ #include <float.h> #define COBJMACROS +#define CONST_VTABLE #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -76,7 +77,7 @@ static BOOL HAVE_OLEAUT32_INT_PTR; */ typedef struct IRecordInfoImpl { - const IRecordInfoVtbl *lpvtbl; + IRecordInfo IRecordInfo_iface; LONG ref; DWORD sizeCalled; DWORD clearCalled; @@ -84,12 +85,17 @@ typedef struct IRecordInfoImpl static const IRecordInfoVtbl IRecordInfoImpl_VTable; +static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) +{ + return CONTAINING_RECORD(iface, IRecordInfoImpl, IRecordInfo_iface); +} + static IRecordInfoImpl *IRecordInfoImpl_Construct(void) { IRecordInfoImpl *rec; rec = HeapAlloc(GetProcessHeap(), 0, sizeof(IRecordInfoImpl)); - rec->lpvtbl = &IRecordInfoImpl_VTable; + rec->IRecordInfo_iface.lpVtbl = &IRecordInfoImpl_VTable; rec->ref = START_REF_COUNT; rec->clearCalled = 0; rec->sizeCalled = 0; @@ -98,13 +104,13 @@ static IRecordInfoImpl *IRecordInfoImpl_Construct(void) static ULONG CALLBACK IRecordInfoImpl_AddRef(IRecordInfo *iface) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); return InterlockedIncrement(&This->ref); } static ULONG CALLBACK IRecordInfoImpl_Release(IRecordInfo *iface) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); return InterlockedDecrement(&This->ref); } @@ -112,14 +118,14 @@ static BOOL fail_GetSize; /* Whether to fail the GetSize call */ static HRESULT CALLBACK IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvExisting) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->clearCalled++; return S_OK; } static HRESULT CALLBACK IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG* size) { - IRecordInfoImpl* This=(IRecordInfoImpl*)iface; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->sizeCalled++; *size = 17; if (fail_GetSize) @@ -1449,7 +1455,7 @@ static void test_SafeArrayCreateEx(void) hres = pSafeArrayGetRecordInfo(sa, &saRec); ok(hres == S_OK,"GRI failed\n"); - ok(saRec == (IRecordInfo*)iRec,"Different saRec\n"); + ok(saRec == &iRec->IRecordInfo_iface, "Different saRec\n"); ok(iRec->ref == START_REF_COUNT + 2, "Didn't AddRef %d\n", iRec->ref); if (iRec->ref == START_REF_COUNT + 2) IRecordInfo_Release(saRec);

1 0

Alexandre Julliard : user32: Don' t call GetModuleFileNameW under the user lock.
by Alexandre Julliard 14 Dec '10

14 Dec '10

Module: wine Branch: master Commit: 2c63cf58eaeec9495c8aa174d62fe1c31aad3e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c63cf58eaeec9495c8aa174d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 13:49:14 2010 +0100 user32: Don't call GetModuleFileNameW under the user lock. --- dlls/user32/cursoricon.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index eeaae7a..356dbd8 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1682,6 +1682,7 @@ BOOL WINAPI GetIconInfoExA( HICON icon, ICONINFOEXA *info ) BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) { struct cursoricon_object *ptr; + HMODULE module; BOOL ret = TRUE; if (info->cbSize != sizeof(*info)) @@ -1707,7 +1708,6 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) info->szResName[0] = 0; if (ptr->module) { - GetModuleFileNameW( ptr->module, info->szModName, MAX_PATH ); if (IS_INTRESOURCE( ptr->resname )) info->wResID = LOWORD( ptr->resname ); else lstrcpynW( info->szResName, ptr->resname, MAX_PATH ); } @@ -1717,7 +1717,9 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) DeleteObject( info->hbmColor ); ret = FALSE; } + module = ptr->module; release_icon_ptr( icon, ptr ); + if (ret && module) GetModuleFileNameW( module, info->szModName, MAX_PATH ); return ret; }

1 0