October 2012 - Wine-Commits

Michael Stefaniuc : user32: Avoid sizeof on structs with variable length array.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 5f304e7000063f92c1e55c1def40640844179127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f304e7000063f92c1e55c1de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 31 11:34:10 2012 +0100 user32: Avoid sizeof on structs with variable length array. --- dlls/user32/exticon.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 840483c..5682c77 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -216,9 +216,6 @@ static BYTE * ICO_LoadIcon( LPBYTE peimage, LPicoICONDIRENTRY lpiIDE, ULONG *uSi * * Reads .ico file and build phony ICONDIR struct */ -#define HEADER_SIZE (sizeof(CURSORICONDIR) - sizeof (CURSORICONDIRENTRY)) -#define HEADER_SIZE_FILE (sizeof(icoICONDIR) - sizeof (icoICONDIRENTRY)) - static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG *uSize ) { CURSORICONDIR * lpcid; /* icon resource in resource-dir format */ @@ -233,7 +230,7 @@ static BYTE * ICO_GetIconDirectory( LPBYTE peimage, LPicoICONDIR* lplpiID, ULONG return 0; /* allocate the phony ICONDIR structure */ - *uSize = lpcid->idCount * sizeof(CURSORICONDIRENTRY) + HEADER_SIZE; + *uSize = FIELD_OFFSET(CURSORICONDIR, idEntries[lpcid->idCount]); if( (lpID = HeapAlloc(GetProcessHeap(),0, *uSize) )) { /* copy the header */

1 0

Jacek Caban : jscript: Fixed some leaks (coverity).
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 12adc677820f59a7d079eec26cf3a998a222f4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12adc677820f59a7d079eec26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 10:21:09 2012 +0100 jscript: Fixed some leaks (coverity). --- dlls/jscript/dispex.c | 4 +++- dlls/jscript/function.c | 4 +++- dlls/jscript/number.c | 4 +++- dlls/jscript/vbarray.c | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 211ed8a..2be474e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -901,8 +901,10 @@ HRESULT create_dispex(script_ctx_t *ctx, const builtin_info_t *builtin_info, jsd return E_OUTOFMEMORY; hres = init_dispex(ret, ctx, builtin_info ? builtin_info : &dispex_info, prototype); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(ret); return hres; + } *dispex = ret; return S_OK; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 4cac3d6..c5bcd2e 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -578,8 +578,10 @@ static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_ hres = init_dispex_from_constr(&function->dispex, ctx, builtin_info, ctx->function_constr); else hres = init_dispex_from_constr(&function->dispex, ctx, &FunctionInst_info, ctx->function_constr); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(function); return hres; + } function->flags = flags; function->length = flags & PROPF_ARGMASK; diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index b7a1a76..ed773a3 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -609,8 +609,10 @@ static HRESULT alloc_number(script_ctx_t *ctx, jsdisp_t *object_prototype, Numbe hres = init_dispex(&number->dispex, ctx, &Number_info, object_prototype); else hres = init_dispex_from_constr(&number->dispex, ctx, &NumberInst_info, ctx->number_constr); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(number); return hres; + } *ret = number; return S_OK; diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 5878866..7b9993b 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -184,6 +184,8 @@ static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, un if(r) *r = jsval_obj(array); + else + jsdisp_release(array); return S_OK; }

1 0

André Hentschel : vbscript: Avoid memory leak in compile_select_statement (coverity).
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 1aa6236428ad4254d7024e023d8561b2abb47a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa6236428ad4254d7024e023… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:07:10 2012 +0100 vbscript: Avoid memory leak in compile_select_statement (coverity). --- dlls/vbscript/compile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 58afdf4..d324284 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -836,7 +836,7 @@ static HRESULT compile_select_statement(compile_ctx_t *ctx, select_statement_t * hres = push_instr_addr(ctx, OP_jmp, end_label); if(FAILED(hres)) - return hres; + break; } heap_free(case_labels);

1 0

André Hentschel : usp10: Avoid memory leak in ScriptTextOut (coverity).
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 4ee73e69b5e7a01852967f6609a551b01c0311d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee73e69b5e7a01852967f660… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 30 20:06:57 2012 +0100 usp10: Avoid memory leak in ScriptTextOut (coverity). --- dlls/usp10/usp10.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 9bd55b4..7f181d0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3246,7 +3246,10 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN rtlGlyphs = heap_alloc(cGlyphs * sizeof(WORD)); if (!rtlGlyphs) + { + heap_free(lpDx); return E_OUTOFMEMORY; + } for (i = 0; i < cGlyphs; i++) rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i];

1 0

Christian Costa : d3drm: Init vertices before creating group.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 43d3ba36a1c31ffa8f365eaadcccfd727f8a6020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d3ba36a1c31ffa8f365eaad… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 31 09:56:07 2012 +0100 d3drm: Init vertices before creating group. --- dlls/d3drm/meshbuilder.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 87ff35c..c28cefd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2081,6 +2081,18 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil unsigned* out_ptr; DWORD* in_ptr = This->pFaceData; int i, j; + D3DRMVERTEX* vertices; + + vertices = HeapAlloc(GetProcessHeap(), 0, This->nb_vertices * sizeof(D3DRMVERTEX)); + if (!vertices) + { + IDirect3DRMMesh_Release(*mesh); + return E_OUTOFMEMORY; + } + for (i = 0; i < This->nb_vertices; i++) + vertices[i].position = This->pVertices[i]; + hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, This->nb_vertices, vertices); + HeapFree(GetProcessHeap(), 0, vertices); face_data = HeapAlloc(GetProcessHeap(), 0, This->face_data_size * sizeof(DWORD)); if (!face_data) @@ -2121,25 +2133,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil hr = IDirect3DRMMesh_AddGroup(*mesh, This->nb_vertices, This->nb_faces, vertex_per_face, face_data, &group); HeapFree(GetProcessHeap(), 0, face_data); - if (SUCCEEDED(hr)) - { - D3DRMVERTEX* vertices; - vertices = HeapAlloc(GetProcessHeap(), 0, This->nb_vertices * sizeof(D3DRMVERTEX)); - if (vertices) - { - for (i = 0; i < This->nb_vertices; i++) - { - vertices[i].position = This->pVertices[i]; - } - hr = IDirect3DRMMesh_SetVertices(*mesh, 0, 0, This->nb_vertices, vertices); - HeapFree(GetProcessHeap(), 0, vertices); - } - else - { - hr = E_OUTOFMEMORY; - } - } if (SUCCEEDED(hr)) hr = IDirect3DRMMesh_SetGroupColor(*mesh, 0, This->color); if (SUCCEEDED(hr))

1 0

Huw Davies : vbscript: The first day of the week should default to Sunday, not the system default.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 908c2d44e1fdb2c3039e8505bd0269fedb3f0614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908c2d44e1fdb2c3039e8505b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 31 12:06:23 2012 +0000 vbscript: The first day of the week should default to Sunday, not the system default. --- dlls/vbscript/global.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 900242b..420a5a5 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1426,7 +1426,7 @@ static HRESULT Global_FormatDateTime(vbdisp_t *This, VARIANT *arg, unsigned args static HRESULT Global_WeekdayName(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - int weekday, first_day = 0, abbrev = 0; + int weekday, first_day = 1, abbrev = 0; BSTR ret; HRESULT hres;

1 0

Nikolay Sivov : dwrite: Support for Armenian, Hebrew and complete Arabic ranges.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 368bc8aa5080a3bab338872bcea1983879d95cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=368bc8aa5080a3bab338872bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 31 10:44:49 2012 -0400 dwrite: Support for Armenian, Hebrew and complete Arabic ranges. --- dlls/dwrite/analyzer.c | 8 +++++++- dlls/dwrite/tests/analyzer.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 541914b..0a0642a 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -29,10 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); enum scriptcode { Script_Arabic = 0, + Script_Armenian = 1, Script_C1Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, Script_Greek = 23, + Script_Hebrew = 29, Script_Latin = 38, Script_Symbol = 77, Script_Unknown = (UINT16)-1 @@ -79,8 +81,12 @@ static const struct script_range script_ranges[] = { /* Cyrillic Supplement range is incomplete cause it's based on Unicode 5.2 that doesn't define some Abkhaz and Azerbaijani letters, we support Unicode 6.0 range here */ { Script_Cyrillic, 0x400, 0x52f }, + /* Armenian: U+0530–U+058F */ + { Script_Armenian, 0x530, 0x58f }, + /* Hebrew: U+0590–U+05FF */ + { Script_Hebrew, 0x590, 0x5ff }, /* Arabic: U+0600–U+06FF */ - { Script_Arabic, 0x600, 0x6ef }, + { Script_Arabic, 0x600, 0x6ff }, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index c610357..648759f 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -391,17 +391,19 @@ static IDWriteTextAnalysisSourceVtbl analysissourcevtbl = { static IDWriteTextAnalysisSource analysissource = { &analysissourcevtbl }; struct sa_test { - const WCHAR string[20]; + const WCHAR string[50]; int item_count; struct script_analysis sa[10]; }; enum scriptcode { Script_Arabic = 0, + Script_Armenian = 1, Script_C1Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, Script_Greek = 23, + Script_Hebrew = 29, Script_Latin = 38, Script_Symbol = 77 }; @@ -435,6 +437,14 @@ static struct sa_test sa_tests[] = { { { 0, 7, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { + /* Arabic */ + {0x0627,0x0644,0x0635,0x0651,0x0650,0x062d,0x0629,0x064f,' ',0x062a,0x064e, + 0x0627,0x062c,0x064c,' ',0x0639,0x064e,0x0644,0x0649,' ', + 0x0631,0x064f,0x0624,0x0648,0x0633,0x0650,' ',0x0627,0x0644, + 0x0623,0x0635,0x0650,0x062d,0x0651,0x064e,0x0627,0x0621,0x0650,0x06f0,0x06f5,0}, 1, + { { 0, 40, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { /* Arabic, Latin */ {'1','2','3','-','5','2',0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,'7','1','.',0}, 1, { { 0, 16, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} @@ -505,6 +515,23 @@ static struct sa_test sa_tests[] = { {0x400,0x40f,0x410,0x44f,0x450,0x45f,0x460,0x481,0x48a,0x4f0,0x4fa,0x4ff,0x500,0x510,0x520,0}, 1, { { 0, 15, { Script_Cyrillic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, + { + /* Armenian */ + {0x531,0x540,0x559,0x55f,0x570,0x589,0x58a,0}, 1, + { { 0, 7, { Script_Armenian, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Hebrew */ + {0x5e9,0x5dc,0x5d5,0x5dd,0}, 1, + { { 0, 4, { Script_Hebrew, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Hebrew */ + {'p','a','r','t',' ','o','n','e',' ',0x5d7,0x5dc,0x5e7,' ',0x5e9,0x5ea,0x5d9,0x5d9,0x5dd,' ','p','a','r','t',' ','t','h','r','e','e',0}, 3, + { { 0, 9, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }, + { 9, 10, { Script_Hebrew, DWRITE_SCRIPT_SHAPES_DEFAULT } }, + { 19, 10, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0

Jacek Caban : advpack: Added ExtractFilesW implementation.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 57b83719b7921c5af268fdfcff633012bf95c3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b83719b7921c5af268fdfcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 31 11:28:28 2012 +0100 advpack: Added ExtractFilesW implementation. --- dlls/advpack/advpack_private.h | 23 +++++++++++++++++++++++ dlls/advpack/files.c | 32 ++++++++++++++++++++++++++++++-- dlls/advpack/tests/files.c | 19 +++++++++++++++++++ 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index cbbbf48..a1bcfe4 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -27,4 +27,27 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECL HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +static inline char *heap_strdupWtoA(const WCHAR *str) +{ + char *ret = NULL; + + if(str) { + size_t size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + ret = heap_alloc(size); + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + } + + return ret; +} + #endif /* __ADVPACK_PRIVATE_H */ diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index f6056f2..c34f6d5 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -779,11 +779,39 @@ done: HRESULT WINAPI ExtractFilesW(LPCWSTR CabName, LPCWSTR ExpandDir, DWORD Flags, LPCWSTR FileList, LPVOID LReserved, DWORD Reserved) { + char *cab_name = NULL, *expand_dir = NULL, *file_list = NULL; + HRESULT hres = S_OK; - FIXME("(%s, %s, %d, %s, %p, %d) stub!\n", debugstr_w(CabName), debugstr_w(ExpandDir), + TRACE("(%s, %s, %d, %s, %p, %d)\n", debugstr_w(CabName), debugstr_w(ExpandDir), Flags, debugstr_w(FileList), LReserved, Reserved); - return E_FAIL; + if(CabName) { + cab_name = heap_strdupWtoA(CabName); + if(!cab_name) + return E_OUTOFMEMORY; + } + + if(ExpandDir) { + expand_dir = heap_strdupWtoA(ExpandDir); + if(!expand_dir) + hres = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hres) && FileList) { + file_list = heap_strdupWtoA(FileList); + if(!file_list) + hres = E_OUTOFMEMORY; + } + + /* cabinet.dll, which does the real job of extracting files, doesn't have UNICODE API, + so we need W->A conversion at some point anyway. */ + if(SUCCEEDED(hres)) + hres = ExtractFilesA(cab_name, expand_dir, Flags, file_list, LReserved, Reserved); + + heap_free(cab_name); + heap_free(expand_dir); + heap_free(file_list); + return hres; } /*********************************************************************** diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 9bb8cde..4a985be 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -32,6 +32,7 @@ static HMODULE hAdvPack; static HRESULT (WINAPI *pAddDelBackupEntry)(LPCSTR, LPCSTR, LPCSTR, DWORD); static HRESULT (WINAPI *pExtractFiles)(LPCSTR, LPCSTR, DWORD, LPCSTR, LPVOID, DWORD); +static HRESULT (WINAPI *pExtractFilesW)(const WCHAR*,const WCHAR*,DWORD,const WCHAR*,void*,DWORD); static HRESULT (WINAPI *pAdvInstallFile)(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,DWORD,DWORD); static CHAR CURR_DIR[MAX_PATH]; @@ -44,6 +45,7 @@ static void init_function_pointers(void) { pAddDelBackupEntry = (void *)GetProcAddress(hAdvPack, "AddDelBackupEntry"); pExtractFiles = (void *)GetProcAddress(hAdvPack, "ExtractFiles"); + pExtractFilesW = (void *)GetProcAddress(hAdvPack, "ExtractFilesW"); pAdvInstallFile = (void*)GetProcAddress(hAdvPack, "AdvInstallFile"); } } @@ -468,6 +470,23 @@ static void test_ExtractFiles(void) ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); ok(!RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to not exist\n"); + + if(pExtractFilesW) { + static const WCHAR extract_cabW[] = {'e','x','t','r','a','c','t','.','c','a','b',0}; + static const WCHAR destW[] = {'d','e','s','t',0}; + static const WCHAR file_listW[] = + {'a','.','t','x','t',':','t','e','s','t','d','i','r','\\','c','.','t','x','t',0}; + + hr = pExtractFilesW(extract_cabW, destW, 0, file_listW, NULL, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); + ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); + ok(RemoveDirectoryA("dest\\testdir"), "Expected dest\\testdir to exist\n"); + ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + }else { + win_skip("ExtractFilesW not available\n"); + } } static void test_AdvInstallFile(void)

1 0

Daniel Lehman : msvcp: Sync fpos usage and istream<>::tellg.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: a49da3ca5d8bef49dc4ff7694690ca801e7811aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49da3ca5d8bef49dc4ff7694… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 30 13:14:57 2012 -0700 msvcp: Sync fpos usage and istream<>::tellg. --- dlls/msvcp100/ios.c | 111 ++++++++++++++++++++++------------------------ dlls/msvcp60/ios.c | 119 ++++++++++++++++++++++++------------------------- dlls/msvcp71/ios.c | 123 +++++++++++++++++++++++++-------------------------- 3 files changed, 171 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a49da3ca5d8bef49dc4ff…

1 0

Frédéric Delanoy : rpcrt4: Fix resources leaks.
by Alexandre Julliard Oct. 31, 2012

Oct. 31, 2012

Module: wine Branch: master Commit: 9c63a30c2591a3c75b8d431bc94b208e3c15153b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c63a30c2591a3c75b8d431bc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 31 09:43:46 2012 +0100 rpcrt4: Fix resources leaks. --- dlls/rpcrt4/rpc_transport.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 686ce68..aebb05e 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1345,6 +1345,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (getsockname(sock, (struct sockaddr *)&sa, &sa_len)) { WARN("getsockname() failed: %s\n", strerror(errno)); + closesocket(sock); status = RPC_S_CANT_CREATE_ENDPOINT; continue; } @@ -1355,6 +1356,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (ret) { WARN("getnameinfo failed: %s\n", gai_strerror(ret)); + closesocket(sock); status = RPC_S_CANT_CREATE_ENDPOINT; continue; } @@ -2139,6 +2141,8 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) { HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, proxy); + HeapFree(GetProcessHeap(), 0, servername); ERR("InternetOpenW failed with error %d\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } @@ -2153,6 +2157,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) { HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, proxy); return RPC_S_OUT_OF_RESOURCES; } MultiByteToWideChar(CP_ACP, 0, httpc->common.NetworkAddr, -1, servername, strlen(httpc->common.NetworkAddr) + 1); @@ -2163,6 +2168,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, proxy); HeapFree(GetProcessHeap(), 0, servername); if (!httpc->session)

1 0