December 2012 - Wine-commits

Andrew Talbot : user32: Do not call HeapFree() with address of stack memory .
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 2f7885d99011e171fd3de3339374246e0f31cad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7885d99011e171fd3de3339… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 4 22:20:37 2012 +0000 user32: Do not call HeapFree() with address of stack memory. --- dlls/user32/sysparams.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3e9a639..08098c0 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -977,7 +977,6 @@ static BOOL get_path_entry( union sysparam_all_entry *entry, UINT int_param, voi if (load_entry( &entry->hdr, buffer, sizeof(buffer) )) lstrcpynW( entry->path.path, buffer, MAX_PATH ); - HeapFree( GetProcessHeap(), 0, buffer ); } lstrcpynW( ptr_param, entry->path.path, int_param ); return TRUE; @@ -996,7 +995,6 @@ static BOOL set_path_entry( union sysparam_all_entry *entry, UINT int_param, voi strcpyW( entry->path.path, buffer ); entry->hdr.loaded = TRUE; } - HeapFree( GetProcessHeap(), 0, buffer ); return ret; }

1 0

Michael Stefaniuc : qmgr: COM cleanup for the IEnumBackgroundCopyJobs iface .
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: efff59a2c810ff9d6709e4af3493a130ba38f7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=efff59a2c810ff9d6709e4af3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 23:24:45 2012 +0100 qmgr: COM cleanup for the IEnumBackgroundCopyJobs iface. --- dlls/qmgr/enum_jobs.c | 90 ++++++++++++++++++++++++++----------------------- dlls/qmgr/qmgr.h | 10 ----- 2 files changed, 48 insertions(+), 52 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 1805a6a..3da0d13 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -23,6 +23,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +typedef struct +{ + IEnumBackgroundCopyJobs IEnumBackgroundCopyJobs_iface; + LONG ref; + IBackgroundCopyJob **jobs; + ULONG numJobs; + ULONG indexJobs; +} EnumBackgroundCopyJobsImpl; + +static inline EnumBackgroundCopyJobsImpl *impl_from_IEnumBackgroundCopyJobs(IEnumBackgroundCopyJobs *iface) +{ + return CONTAINING_RECORD(iface, EnumBackgroundCopyJobsImpl, IEnumBackgroundCopyJobs_iface); +} + static void EnumBackgroundCopyJobsDestructor(EnumBackgroundCopyJobsImpl *This) { ULONG i; @@ -34,52 +48,49 @@ static void EnumBackgroundCopyJobsDestructor(EnumBackgroundCopyJobsImpl *This) HeapFree(GetProcessHeap(), 0, This); } -static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_AddRef( - IEnumBackgroundCopyJobs* iface) -{ - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; - return InterlockedIncrement(&This->ref); -} - -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_QueryInterface( - IEnumBackgroundCopyJobs* iface, - REFIID riid, - void **ppvObject) +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_QueryInterface(IEnumBackgroundCopyJobs *iface, + REFIID riid, void **ppv) { - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; - TRACE("IID: %s\n", debugstr_guid(riid)); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IEnumBackgroundCopyJobs)) + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumBackgroundCopyJobs)) { - *ppvObject = &This->lpVtbl; - BITS_IEnumBackgroundCopyJobs_AddRef(iface); + *ppv = iface; + IEnumBackgroundCopyJobs_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *ppv = NULL; return E_NOINTERFACE; } -static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_Release( - IEnumBackgroundCopyJobs* iface) +static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_AddRef(IEnumBackgroundCopyJobs *iface) { - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_Release(IEnumBackgroundCopyJobs *iface) +{ + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p) ref=%d\n", This, ref); + if (ref == 0) EnumBackgroundCopyJobsDestructor(This); return ref; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Next( - IEnumBackgroundCopyJobs* iface, - ULONG celt, - IBackgroundCopyJob **rgelt, - ULONG *pceltFetched) +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Next(IEnumBackgroundCopyJobs *iface, ULONG celt, + IBackgroundCopyJob **rgelt, ULONG *pceltFetched) { - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); ULONG fetched; ULONG i; IBackgroundCopyJob *job; @@ -110,11 +121,9 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Next( return fetched == celt ? S_OK : S_FALSE; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Skip( - IEnumBackgroundCopyJobs* iface, - ULONG celt) +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Skip(IEnumBackgroundCopyJobs *iface, ULONG celt) { - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); if (This->numJobs - This->indexJobs < celt) { @@ -126,27 +135,24 @@ static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Skip( return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Reset( - IEnumBackgroundCopyJobs* iface) +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Reset(IEnumBackgroundCopyJobs *iface) { - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); This->indexJobs = 0; return S_OK; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Clone( - IEnumBackgroundCopyJobs* iface, - IEnumBackgroundCopyJobs **ppenum) +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_Clone(IEnumBackgroundCopyJobs *iface, + IEnumBackgroundCopyJobs **ppenum) { FIXME("Not implemented\n"); return E_NOTIMPL; } -static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_GetCount( - IEnumBackgroundCopyJobs* iface, +static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_GetCount(IEnumBackgroundCopyJobs *iface, ULONG *puCount) { - EnumBackgroundCopyJobsImpl *This = (EnumBackgroundCopyJobsImpl *) iface; + EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); *puCount = This->numJobs; return S_OK; } @@ -174,7 +180,7 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCop This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &BITS_IEnumBackgroundCopyJobs_Vtbl; + This->IEnumBackgroundCopyJobs_iface.lpVtbl = &BITS_IEnumBackgroundCopyJobs_Vtbl; This->ref = 1; /* Create array of jobs */ @@ -206,6 +212,6 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCop } LeaveCriticalSection(&qmgr->cs); - *enumjob = (IEnumBackgroundCopyJobs *)&This->lpVtbl; + *enumjob = &This->IEnumBackgroundCopyJobs_iface; return S_OK; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index d591d20..4bd1e34 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -46,16 +46,6 @@ typedef struct struct list entryFromQmgr; } BackgroundCopyJobImpl; -/* Enum background copy jobs vtbl and related data */ -typedef struct -{ - const IEnumBackgroundCopyJobsVtbl *lpVtbl; - LONG ref; - IBackgroundCopyJob **jobs; - ULONG numJobs; - ULONG indexJobs; -} EnumBackgroundCopyJobsImpl; - /* Enum background copy files vtbl and related data */ typedef struct {

1 0

Michael Stefaniuc : qmgr: Merge a helper function.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 258d1ff897c62f3d568e56b9a0eb96e066aed323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258d1ff897c62f3d568e56b9a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 23:27:01 2012 +0100 qmgr: Merge a helper function. --- dlls/qmgr/enum_jobs.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 3da0d13..20f427c 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -37,17 +37,6 @@ static inline EnumBackgroundCopyJobsImpl *impl_from_IEnumBackgroundCopyJobs(IEnu return CONTAINING_RECORD(iface, EnumBackgroundCopyJobsImpl, IEnumBackgroundCopyJobs_iface); } -static void EnumBackgroundCopyJobsDestructor(EnumBackgroundCopyJobsImpl *This) -{ - ULONG i; - - for(i = 0; i < This->numJobs; i++) - IBackgroundCopyJob_Release(This->jobs[i]); - - HeapFree(GetProcessHeap(), 0, This->jobs); - HeapFree(GetProcessHeap(), 0, This); -} - static HRESULT WINAPI BITS_IEnumBackgroundCopyJobs_QueryInterface(IEnumBackgroundCopyJobs *iface, REFIID riid, void **ppv) { @@ -78,11 +67,16 @@ static ULONG WINAPI BITS_IEnumBackgroundCopyJobs_Release(IEnumBackgroundCopyJobs { EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; TRACE("(%p) ref=%d\n", This, ref); - if (ref == 0) - EnumBackgroundCopyJobsDestructor(This); + if (ref == 0) { + for(i = 0; i < This->numJobs; i++) + IBackgroundCopyJob_Release(This->jobs[i]); + HeapFree(GetProcessHeap(), 0, This->jobs); + HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

Stefan Dösinger : wined3d: Bind the src in a manual presentation blit.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 7b95df03c683e52b31d0e6a9e9e81072139c8f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b95df03c683e52b31d0e6a9e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 5 09:01:33 2012 +0100 wined3d: Bind the src in a manual presentation blit. --- dlls/wined3d/swapchain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2fa221a..83d2ab5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -366,6 +366,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, ENTER_GL(); context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, swapchain->front_buffer, NULL, SFLAG_INDRAWABLE); + context_bind_texture(context2, backbuffer->texture_target, backbuffer->texture_name); /* Set up the texture. The surface is not in a wined3d_texture * container, so there are no D3D texture settings to dirtify. */

1 0

Stefan Dösinger : wined3d: Correctly count used stages in the atifs pipeline.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 33802da4f3fcf53960d2d5c628376eb1dda22805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33802da4f3fcf53960d2d5c62… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 5 09:01:34 2012 +0100 wined3d: Correctly count used stages in the atifs pipeline. --- dlls/wined3d/ati_fragment_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index fba55ea..1b9b969 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -857,7 +857,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined { if (settings.op[i].cop == WINED3D_TOP_DISABLE) break; - new_desc->num_textures_used = i; + new_desc->num_textures_used = i + 1; } memcpy(&new_desc->parent.settings, &settings, sizeof(settings));

1 0

Stefan Dösinger : wined3d: Test the correct program for native limits.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: e53aa8c9e223e8db51bc13b7424700c010fcfb77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53aa8c9e223e8db51bc13b74… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 5 09:01:35 2012 +0100 wined3d: Test the correct program for native limits. --- 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 45e725c..ee7762d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4315,7 +4315,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, { GLint native; - GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); checkGLcall("glGetProgramivARB()"); if (!native) WARN("Program exceeds native resource limits.\n");

1 0

Stefan Dösinger : wined3d: Use sign fixup for the atifs bumpenv matrix.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 799ea13fb90e36412e9773eb93da83675ed5e04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=799ea13fb90e36412e9773eb9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 5 09:01:36 2012 +0100 wined3d: Use sign fixup for the atifs bumpenv matrix. --- dlls/wined3d/ati_fragment_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 1b9b969..6aa91a6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -468,11 +468,11 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con */ wrap_op3(gl_info, GL_MAD_ATI, GL_REG_0_ATI + stage + 1, GL_ALPHA, GL_NONE, GL_REG_0_ATI + stage, GL_RED, argmodextra_y, - ATI_FFP_CONST_BUMPMAT(stage), GL_BLUE, GL_NONE, + ATI_FFP_CONST_BUMPMAT(stage), GL_BLUE, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI, GL_REG_0_ATI + stage + 1, GL_GREEN, GL_NONE); wrap_op3(gl_info, GL_MAD_ATI, GL_REG_0_ATI + stage + 1, GL_GREEN_BIT_ATI, GL_NONE, GL_REG_0_ATI + stage, GL_GREEN, argmodextra_y, - ATI_FFP_CONST_BUMPMAT(stage), GL_ALPHA, GL_NONE, + ATI_FFP_CONST_BUMPMAT(stage), GL_ALPHA, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI, GL_REG_0_ATI + stage + 1, GL_ALPHA, GL_NONE); }

1 0

Stefan Dösinger : wined3d: Add GL_ALPHA to the atifs argument replicator debug function.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 8e05ee699475677e3c254f342c62396fc04e6267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e05ee699475677e3c254f342… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 5 09:01:37 2012 +0100 wined3d: Add GL_ALPHA to the atifs argument replicator debug function. --- dlls/wined3d/ati_fragment_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 6aa91a6..4994d96 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -157,6 +157,7 @@ static const char *debug_rep(GLuint rep) { case GL_RED: return "GL_RED"; case GL_GREEN: return "GL_GREEN"; case GL_BLUE: return "GL_BLUE"; + case GL_ALPHA: return "GL_ALPHA"; default: return "unknown argrep"; } }

1 0

Alexandre Julliard : user32: Ignore the PM_NOYIELD flag on the client side.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 1cf2c9c179ddf756a89d0a746414542200fdd47a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf2c9c179ddf756a89d0a746… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 12:48:30 2012 +0100 user32: Ignore the PM_NOYIELD flag on the client side. --- dlls/user32/message.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 8ca259b..3f0312a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3685,13 +3685,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, { DWORD ret; - flush_window_surfaces( !(flags & PM_NOYIELD) ); - - if (flags & PM_NOYIELD) - ret = USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); - else - ret = wow_handlers.wait_message( 0, NULL, 0, QS_ALLINPUT, 0 ); - + flush_window_surfaces( TRUE ); + ret = wow_handlers.wait_message( 0, NULL, 0, QS_ALLINPUT, 0 ); /* if we received driver events, check again for a pending message */ if (ret == WAIT_TIMEOUT || !peek_message( &msg, hwnd, first, last, flags, 0 )) return FALSE; }

1 0

Detlef Riekenberg : shell32: Implement DoEnvironmentSubstW.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: ff2f4941951b99acdb46fa67d64c8069431171c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2f4941951b99acdb46fa67d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 4 11:38:00 2012 +0100 shell32: Implement DoEnvironmentSubstW. --- dlls/shell32/shellord.c | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index c1fb382..b71d213 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1626,14 +1626,47 @@ DWORD WINAPI DoEnvironmentSubstA(LPSTR pszString, UINT cchString) } /************************************************************************ - * DoEnvironmentSubstW [SHELL32.@] + * DoEnvironmentSubstW [SHELL32.@] * - * See DoEnvironmentSubstA. + * Replace all %KEYWORD% in the string with the value of the named + * environment variable. If the buffer is too small, the string is not modified. + * + * PARAMS + * pszString [I] '\0' terminated string with %keyword%. + * [O] '\0' terminated string with %keyword% substituted. + * cchString [I] size of str. + * + * RETURNS + * Success: The string in the buffer is updated + * HIWORD: TRUE + * LOWORD: characters used in the buffer, including space for the terminating 0 + * Failure: buffer too small. The string is not modified. + * HIWORD: FALSE + * LOWORD: provided size of the buffer in characters */ DWORD WINAPI DoEnvironmentSubstW(LPWSTR pszString, UINT cchString) { - FIXME("(%s, %d): stub\n", debugstr_w(pszString), cchString); - return MAKELONG(FALSE,cchString); + LPWSTR dst; + BOOL res = FALSE; + DWORD len = cchString; + + TRACE("(%s, %d)\n", debugstr_w(pszString), cchString); + + if ((cchString < MAXLONG) && (dst = HeapAlloc(GetProcessHeap(), 0, cchString * sizeof(WCHAR)))) + { + len = ExpandEnvironmentStringsW(pszString, dst, cchString); + /* len includes the terminating 0 */ + if (len && len <= cchString) + { + res = TRUE; + memcpy(pszString, dst, len * sizeof(WCHAR)); + } + else + len = cchString; + + HeapFree(GetProcessHeap(), 0, dst); + } + return MAKELONG(len, res); } /************************************************************************

1 0