June 2009 - Wine-commits - list.winehq.org

Francois Gouget : ole32/tests: Make test_readonly() static.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: 70cdb5c3e4e45a1fda26ad32769d159ac795847d URL: http://source.winehq.org/git/wine.git/?a=commit;h=70cdb5c3e4e45a1fda26ad327… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 5 08:15:48 2009 +0200 ole32/tests: Make test_readonly() static. --- dlls/ole32/tests/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 29ff0c6..5fef82c 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1222,7 +1222,7 @@ static void test_access(void) DeleteFileA("winetest"); } -void test_readonly(void) +static void test_readonly(void) { IStorage *stg, *stg2, *stg3; IStream *stream;

1 0

Henri Verbeet : wined3d: Check the result from wine_rb_get() before using it in WINE_RB_ENTRY_VALUE.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: cae6a32b0807bebd5a7dc317c4241de3496ad367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae6a32b0807bebd5a7dc317c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:46 2009 +0200 wined3d: Check the result from wine_rb_get() before using it in WINE_RB_ENTRY_VALUE. --- dlls/wined3d/glsl_shader.c | 5 +++-- dlls/wined3d/utils.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 89b1e03..bd91bc9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3277,6 +3277,7 @@ 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) { + struct wine_rb_entry *entry; glsl_program_key_t key; key.vshader = vshader; @@ -3284,8 +3285,8 @@ static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_p key.vs_args = *vs_args; key.ps_args = *ps_args; - return WINE_RB_ENTRY_VALUE(wine_rb_get(&priv->program_lookup, &key), - struct glsl_shader_prog_link, program_lookup_entry); + entry = wine_rb_get(&priv->program_lookup, &key); + return entry ? WINE_RB_ENTRY_VALUE(entry, struct glsl_shader_prog_link, program_lookup_entry) : NULL; } /* GL locking is done by the caller */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e4c09c8..596bccb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2103,7 +2103,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings) { - return WINE_RB_ENTRY_VALUE(wine_rb_get(fragment_shaders, settings), struct ffp_frag_desc, entry); + struct wine_rb_entry *entry = wine_rb_get(fragment_shaders, settings); + return entry ? WINE_RB_ENTRY_VALUE(entry, struct ffp_frag_desc, entry) : NULL; } void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc)

1 0

Henri Verbeet : wined3d: Don't use the vertex/pixel shader when we' re not supposed to.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: daeb86d620f48b5eb8a12feb08864c6211be8b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=daeb86d620f48b5eb8a12feb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:46 2009 +0200 wined3d: Don't use the vertex/pixel shader when we're not supposed to. This also avoids removing programs from lists they're not in in delete_glsl_program_entry(). --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bd91bc9..6c0fd84 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3945,8 +3945,8 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct shader_glsl_priv *priv = This->shader_priv; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - IWineD3DPixelShader *pshader = This->stateBlock->pixelShader; - IWineD3DVertexShader *vshader = This->stateBlock->vertexShader; + IWineD3DPixelShader *pshader = use_ps ? This->stateBlock->pixelShader : NULL; + IWineD3DVertexShader *vshader = use_vs ? This->stateBlock->vertexShader : NULL; struct glsl_shader_prog_link *entry = NULL; GLhandleARB programId = 0; GLhandleARB reorder_shader_id = 0;

1 0

Paul Vriens : shell32/tests: Fix test failure on NT4.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: b7aa196449da80786709ae6898743f7b865ea369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7aa196449da80786709ae689… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 4 16:38:00 2009 +0200 shell32/tests: Fix test failure on NT4. --- dlls/shell32/tests/shlexec.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 3460e1f..216c6d0 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -677,6 +677,8 @@ static void test_filename(void) test=filename_tests; while (test->basename) { + BOOL quotedfile = FALSE; + sprintf(filename, test->basename, tmpdir); if (strchr(filename, '/')) { @@ -695,6 +697,8 @@ static void test_filename(void) else { char quoted[MAX_PATH + 2]; + + quotedfile = TRUE; sprintf(quoted, "\"%s\"", filename); rc=shell_execute(test->verb, quoted, NULL, NULL); } @@ -702,7 +706,9 @@ static void test_filename(void) rc=33; if ((test->todo & 0x1)==0) { - ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, + ok(rc==test->rc || + broken(quotedfile && rc == 2), /* NT4 */ + "%s failed: rc=%d err=%d\n", shell_call, rc, GetLastError()); } else todo_wine

1 0

Paul Vriens : riched32/tests: Fix a test failure on NT4 and below.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: d449fcde40a7918d4ec8f157f8d1ed1d9c7e7c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d449fcde40a7918d4ec8f157f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 4 18:02:44 2009 +0200 riched32/tests: Fix a test failure on NT4 and below. --- dlls/riched32/tests/editor.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 079045c..269a425 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -955,7 +955,7 @@ static void test_autoscroll(void) hwnd = CreateWindowEx(0, RICHEDIT_CLASS10A, NULL, WS_POPUP|ES_MULTILINE|WS_VSCROLL|WS_HSCROLL, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); - ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS10A, (int) GetLastError()); ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); ok(ret & ECO_AUTOVSCROLL, "ECO_AUTOVSCROLL isn't set.\n"); ok(!(ret & ECO_AUTOHSCROLL), "ECO_AUTOHSCROLL is set.\n"); @@ -964,10 +964,10 @@ static void test_autoscroll(void) ok(!(ret & ES_AUTOHSCROLL), "ES_AUTOHSCROLL is set.\n"); DestroyWindow(hwnd); - hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + hwnd = CreateWindowEx(0, RICHEDIT_CLASS10A, NULL, WS_POPUP|ES_MULTILINE, 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); - ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS10A, (int) GetLastError()); ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); ok(!(ret & ECO_AUTOVSCROLL), "ECO_AUTOVSCROLL is set.\n"); ok(!(ret & ECO_AUTOHSCROLL), "ECO_AUTOHSCROLL is set.\n");

1 0

Paul Vriens : kernel32/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: b3e4155a4189c042ee94a142020dd18221e320f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3e4155a4189c042ee94a1420… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 5 09:10:09 2009 +0200 kernel32/tests: Fix a test failure on Win9x/WinMe. --- dlls/kernel32/tests/debugger.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 9b849b0..2f32478 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -280,15 +280,16 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) /* If, after attaching to the debuggee, the debugger exits without * detaching, then the debuggee gets a special exit code. */ - ok(exit_code == 0xffffffff || /* Win 9x */ - exit_code == 0x80 || /* NT4 */ - exit_code == STATUS_DEBUGGER_INACTIVE, /* Win >= XP */ + ok(exit_code == STATUS_DEBUGGER_INACTIVE || + broken(exit_code == 0xffffffff) || /* Win9x */ + broken(exit_code == WAIT_ABANDONED), /* NT4, W2K */ "wrong exit code : %08x\n", exit_code); } else - ok(exit_code == STATUS_ACCESS_VIOLATION || - exit_code == WAIT_ABANDONED, /* win2k3 */ - "exit code = %08x instead of STATUS_ACCESS_VIOLATION or WAIT_ABANDONED\n", exit_code); + ok(exit_code == STATUS_ACCESS_VIOLATION || + broken(exit_code == WAIT_ABANDONED) || /* NT4, W2K, W2K3 */ + broken(exit_code == 0xffffffff), /* Win9x, WinME */ + "wrong exit code : %08x\n", exit_code); CloseHandle(info.hProcess); /* ...before the debugger */ @@ -410,8 +411,12 @@ static void test_ExitCode(void) crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); if (pDebugSetProcessKillOnExit) crash_and_debug(hkey, test_exe, "dbg,attach,event,nokill"); + else + win_skip("DebugSetProcessKillOnExit is not available\n"); if (pDebugActiveProcessStop) crash_and_debug(hkey, test_exe, "dbg,attach,event,detach"); + else + win_skip("DebugActiveProcessStop is not available\n"); if (disposition == REG_CREATED_NEW_KEY) {

1 0

Paul Vriens : msctf: Fix a possible NULL dereference (Coverity).
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: e42d7f95910d5d5322919baf29be8cacfd46a5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e42d7f95910d5d5322919baf2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 5 09:20:27 2009 +0200 msctf: Fix a possible NULL dereference (Coverity). --- dlls/msctf/range.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index 8b1f482..dc9eae1 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -349,11 +349,13 @@ HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD l HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_ACP *tsAcp) { - Range *This = (Range *)tf->range; + Range *This; if (!tf || !tsAcp || !tf->range) return E_INVALIDARG; + This = (Range *)tf->range; + tsAcp->acpStart = This->anchorStart; tsAcp->acpEnd = This->anchorEnd; tsAcp->style.ase = tf->style.ase;

1 0

Jacek Caban : urlmon: Set INTERNET_OPTION_HTTP_DECODING option in http protocol handler.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: de36782c48c0b159b969d6b4b2a40b71f00603f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de36782c48c0b159b969d6b4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 22:49:56 2009 +0200 urlmon: Set INTERNET_OPTION_HTTP_DECODING option in http protocol handler. --- dlls/urlmon/http.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 272b338..928abba 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -85,7 +85,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ BYTE security_id[512]; DWORD len = 0; ULONG num = 0; - BOOL res; + BOOL res, b; HRESULT hres; static const WCHAR wszBindVerb[BINDVERB_CUSTOM][5] = @@ -209,6 +209,11 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, LPCWSTR url, DWORD requ optional = (LPWSTR)This->base.bind_info.stgmedData.u.hGlobal; } + b = TRUE; + res = InternetSetOptionW(This->base.request, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); + if(!res) + WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %08x\n", GetLastError()); + res = HttpSendRequestW(This->base.request, This->full_header, lstrlenW(This->full_header), optional, optional ? This->base.bind_info.cbstgmedData : 0); if(!res && GetLastError() != ERROR_IO_PENDING) {

1 0

Jacek Caban : urlmon: Use a copy of PROTOCOLDATA in Switch/ Continue implementation.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: 80dd9b9c9e9d3ce6cd81585376aaad85d99cb401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80dd9b9c9e9d3ce6cd8158537… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 22:50:23 2009 +0200 urlmon: Use a copy of PROTOCOLDATA in Switch/Continue implementation. --- dlls/urlmon/bindprot.c | 22 ++++++++++++++++------ dlls/urlmon/tests/protocol.c | 8 ++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index f63824b..aef8c23 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -608,10 +608,14 @@ static HRESULT WINAPI ProtocolHandler_Start(IInternetProtocol *iface, LPCWSTR sz static HRESULT WINAPI ProtocolHandler_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) { BindProtocol *This = PROTOCOLHANDLER_THIS(iface); + HRESULT hres; TRACE("(%p)->(%p)\n", This, pProtocolData); - return IInternetProtocol_Continue(This->protocol, pProtocolData); + hres = IInternetProtocol_Continue(This->protocol, pProtocolData); + + heap_free(pProtocolData); + return hres; } static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocol *iface, HRESULT hrReason, @@ -874,14 +878,14 @@ static ULONG WINAPI BPInternetProtocolSink_Release(IInternetProtocolSink *iface) typedef struct { task_header_t header; - PROTOCOLDATA data; + PROTOCOLDATA *data; } switch_task_t; static void switch_proc(BindProtocol *bind, task_header_t *t) { switch_task_t *task = (switch_task_t*)t; - IInternetProtocol_Continue(bind->protocol_handler, &task->data); + IInternetProtocol_Continue(bind->protocol_handler, task->data); heap_free(task); } @@ -890,12 +894,18 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface PROTOCOLDATA *pProtocolData) { BindProtocol *This = PROTSINK_THIS(iface); + PROTOCOLDATA *data; TRACE("(%p)->(%p)\n", This, pProtocolData); TRACE("flags %x state %x data %p cb %u\n", pProtocolData->grfFlags, pProtocolData->dwState, pProtocolData->pData, pProtocolData->cbData); + data = heap_alloc(sizeof(PROTOCOLDATA)); + if(!data) + return E_OUTOFMEMORY; + memcpy(data, pProtocolData, sizeof(PROTOCOLDATA)); + if(!do_direct_notif(This)) { switch_task_t *task; @@ -903,18 +913,18 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface if(!task) return E_OUTOFMEMORY; - task->data = *pProtocolData; + task->data = data; push_task(This, &task->header, switch_proc); return S_OK; } if(!This->protocol_sink) { - IInternetProtocol_Continue(This->protocol_handler, pProtocolData); + IInternetProtocol_Continue(This->protocol_handler, data); return S_OK; } - return IInternetProtocolSink_Switch(This->protocol_sink, pProtocolData); + return IInternetProtocolSink_Switch(This->protocol_sink, data); } static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR status_text) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index e8aa8f9..50820e8 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -436,6 +436,10 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL CHECK_EXPECT(Switch); ok(pProtocolData != NULL, "pProtocolData == NULL\n"); + if(binding_test) { + ok(pProtocolData != &protocoldata, "pProtocolData == &protocoldata\n"); + ok(!memcmp(pProtocolData, &protocoldata, sizeof(PROTOCOLDATA)), "*pProtocolData != protocoldata\n"); + } pdata = pProtocolData; @@ -1321,6 +1325,10 @@ static HRESULT WINAPI ProtocolEmul_Continue(IInternetProtocol *iface, ok(pProtocolData != NULL, "pProtocolData == NULL\n"); if(!pProtocolData || tested_protocol == BIND_TEST) return S_OK; + if(binding_test) { + ok(pProtocolData != &protocoldata, "pProtocolData == &protocoldata\n"); + ok(!memcmp(pProtocolData, &protocoldata, sizeof(PROTOCOLDATA)), "*pProtocolData != protocoldata\n"); + } switch(prot_state) { case 1: {

1 0

Eric van Beurden : wininet: Check for bad allocation in HeapReAlloc.
by Alexandre Julliard 05 Jun '09

05 Jun '09

Module: wine Branch: master Commit: 5caf80942657bc1b067acfc3f9decc6970ef2fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5caf80942657bc1b067acfc3f… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Jun 4 10:52:16 2009 -0400 wininet: Check for bad allocation in HeapReAlloc. --- dlls/wininet/http.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b11ce21..c6873ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4160,6 +4160,7 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) LPWSTR status_code, status_text; DWORD cchMaxRawHeaders = 1024; LPWSTR lpszRawHeaders = HeapAlloc(GetProcessHeap(), 0, (cchMaxRawHeaders+1)*sizeof(WCHAR)); + LPWSTR temp; DWORD cchRawHeaders = 0; TRACE("-->\n"); @@ -4213,10 +4214,10 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) /* regenerate raw headers */ while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) - { cchMaxRawHeaders *= 2; - lpszRawHeaders = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); - } + temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); + if (temp == NULL) goto lend; + lpszRawHeaders = temp; memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); cchRawHeaders += (buflen-1); memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); @@ -4242,10 +4243,10 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) - { cchMaxRawHeaders *= 2; - lpszRawHeaders = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); - } + temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); + if (temp == NULL) goto lend; + lpszRawHeaders = temp; memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); cchRawHeaders += (buflen-1); memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf));

1 0