April 2008 - Wine-commits - list.winehq.org

Marcus Meissner : rpcrt4: Handle exit path where bind not allocated yet.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: bd38e2b0ed4b7ec522ccb00d8e73e9a05de51935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd38e2b0ed4b7ec522ccb00d8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 16 08:37:26 2008 +0200 rpcrt4: Handle exit path where bind not allocated yet. --- dlls/rpcrt4/rpc_binding.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index d670a88..87ac413 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -725,8 +725,8 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingA( RPC_CSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) ret = RPCRT4_CreateBindingA(&bind, FALSE, (char*)Protseq); - if (ret == RPC_S_OK) - ret = RPCRT4_SetBindingObject(bind, &Uuid); + if (ret != RPC_S_OK) return ret; + ret = RPCRT4_SetBindingObject(bind, &Uuid); if (ret == RPC_S_OK) ret = RPCRT4_CompleteBindingA(bind, (char*)NetworkAddr, (char*)Endpoint, (char*)Options); @@ -764,8 +764,8 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingW( RPC_WSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) ret = RPCRT4_CreateBindingW(&bind, FALSE, Protseq); - if (ret == RPC_S_OK) - ret = RPCRT4_SetBindingObject(bind, &Uuid); + if (ret != RPC_S_OK) return ret; + ret = RPCRT4_SetBindingObject(bind, &Uuid); if (ret == RPC_S_OK) ret = RPCRT4_CompleteBindingW(bind, NetworkAddr, Endpoint, Options);

1 0

Dan Hipschman : qmgr/tests: Fix minor potential memory leaks.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: cacd1c448e633852c77bfa87572aa12895d7e86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cacd1c448e633852c77bfa875… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 15 11:08:48 2008 -0700 qmgr/tests: Fix minor potential memory leaks. --- dlls/qmgr/tests/enum_jobs.c | 3 +++ dlls/qmgr/tests/job.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/qmgr/tests/enum_jobs.c b/dlls/qmgr/tests/enum_jobs.c index 2b73631..f95404c 100644 --- a/dlls/qmgr/tests/enum_jobs.c +++ b/dlls/qmgr/tests/enum_jobs.c @@ -209,6 +209,7 @@ static void test_Next_walkList_2(void) if(hres != S_OK) { skip("Unable to get file from test_enumJobs\n"); + HeapFree(GetProcessHeap(), 0, jobs); return; } ok(fetched == test_jobCountB, "Next returned the incorrect number of jobs: %08x\n", hres); @@ -219,6 +220,8 @@ static void test_Next_walkList_2(void) if (jobs[i]) IBackgroundCopyFile_Release(jobs[i]); } + + HeapFree(GetProcessHeap(), 0, jobs); } /* Test Next Error conditions */ diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 52d4e82..36201f8 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -416,6 +416,8 @@ static void test_CompleteLocalURL(void) if (!urlA || !urlB) { skip("Unable to allocate memory for URLs\n"); + HeapFree(GetProcessHeap(), 0, urlA); + HeapFree(GetProcessHeap(), 0, urlB); return; } @@ -428,6 +430,8 @@ static void test_CompleteLocalURL(void) if (hres != S_OK) { skip("Unable to add file to job\n"); + HeapFree(GetProcessHeap(), 0, urlA); + HeapFree(GetProcessHeap(), 0, urlB); return; } @@ -435,6 +439,8 @@ static void test_CompleteLocalURL(void) if (hres != S_OK) { skip("Unable to add file to job\n"); + HeapFree(GetProcessHeap(), 0, urlA); + HeapFree(GetProcessHeap(), 0, urlB); return; }

1 0

Andrew Talbot : comctl32: Remove unused variables.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 161d3322d697d330ac8e1a7f4fa2cfd3991162e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161d3322d697d330ac8e1a7f4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 15 22:19:12 2008 +0100 comctl32: Remove unused variables. --- dlls/comctl32/syslink.c | 8 +++----- dlls/comctl32/toolbar.c | 3 --- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 02a0385..a1b8aff 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -967,16 +967,14 @@ static HFONT SYSLINK_SetFont (SYSLINK_INFO *infoPtr, HFONT hFont, BOOL bRedraw) */ static LRESULT SYSLINK_SetText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { - int textlen; - /* clear the document */ SYSLINK_ClearDoc(infoPtr); - - if(Text == NULL || (textlen = lstrlenW(Text)) == 0) + + if(Text == NULL || *Text == 0) { return TRUE; } - + /* let's parse the string and create a document */ if(SYSLINK_ParseText(infoPtr, Text) > 0) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9991683..5746928 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5778,7 +5778,6 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) POINT pt; INT nHit; INT nOldIndex = -1; - BOOL bSendMessage = TRUE; NMHDR hdr; NMMOUSE nmmouse; NMTOOLBARA nmtb; @@ -5865,8 +5864,6 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) if (btnPtr->fsStyle & BTNS_GROUP) { nOldIndex = TOOLBAR_GetCheckedGroupButtonIndex (infoPtr, nHit); - if (nOldIndex == nHit) - bSendMessage = FALSE; if ((nOldIndex != nHit) && (nOldIndex != -1)) infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;

1 0

Andrew Talbot : dmime: Remove unused variables.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: a73ab629e9cc5877060411d38cf82405009dbe91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73ab629e9cc5877060411d38… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 15 21:33:30 2008 +0100 dmime: Remove unused variables. --- dlls/dmime/graph.c | 7 +++---- dlls/dmime/performance.c | 3 +-- dlls/dmime/segment.c | 16 ++++++---------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 7d0363a..79ff823 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -108,7 +108,6 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_StampPMsg (LPDIREC static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_InsertTool (LPDIRECTMUSICGRAPH iface, IDirectMusicTool* pTool, DWORD* pdwPChannels, DWORD cPChannels, LONG lIndex) { ICOM_THIS_MULTI(IDirectMusicGraphImpl, GraphVtbl, iface); - HRESULT hr; struct list* pEntry = NULL; struct list* pPrevEntry = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; @@ -142,14 +141,14 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_InsertTool (LPDIRE pNewTool->pTool = pTool; pNewTool->dwIndex = lIndex; IDirectMusicTool8_AddRef(pTool); - hr = IDirectMusicTool8_Init(pTool, iface); + IDirectMusicTool8_Init(pTool, iface); list_add_tail (pPrevEntry->next, &pNewTool->entry); #if 0 DWORD dwNum = 0; - hr = IDirectMusicTool8_GetMediaTypes(pTool, &dwNum); + IDirectMusicTool8_GetMediaTypes(pTool, &dwNum); #endif - + return DS_OK; } diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 9730104..ad3d740 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -222,8 +222,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init (LPDIRECTMUSICPERFORMANC This->pDirectSound = pDirectSound; IDirectSound_AddRef(This->pDirectSound); } else { - HRESULT hr; - hr = DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL); + DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL); if (!This->pDirectSound) return DSERR_NODRIVER; if (NULL != hWnd) { diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index a90bd4c..6b7243a 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -822,9 +822,9 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST /*ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface);*/ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; + DWORD StreamSize, StreamCount, ListSize[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - + DMUS_IO_TRACK_HEADER track_hdr; DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr; IDirectMusicTrack* pTrack = NULL; @@ -869,7 +869,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - ListCount[0] = 0; if (Chunk.fccID == track_hdr.fccType && 0 == track_hdr.ckid) { LPSTREAM pClonedStream = NULL; @@ -982,7 +981,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; + DWORD StreamSize, ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ if (pChunk->fccID != DMUS_FOURCC_TRACK_LIST) { @@ -1002,7 +1001,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); StreamSize = Chunk.dwSize - sizeof(FOURCC); - StreamCount = 0; switch (Chunk.fccID) { case DMUS_FOURCC_TRACK_FORM: { TRACE_(dmfile)(": TRACK form\n"); @@ -1192,14 +1190,13 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadWave (LPPERSISTSTREAM static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); - + HRESULT hr; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount; + DWORD StreamSize; /*DWORD ListSize[3], ListCount[3];*/ LARGE_INTEGER liMove; /* used when skipping chunks */ - - + TRACE("(%p, %p): Loading\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); @@ -1208,7 +1205,6 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); StreamSize = Chunk.dwSize - sizeof(FOURCC); - StreamCount = 0; switch (Chunk.fccID) { case DMUS_FOURCC_SEGMENT_FORM: { TRACE_(dmfile)(": segment form\n");

1 0

Rob Shearman : rpcrt4: Test and fix I_RpcExceptionFilter.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 4efff322911b224e727dc6df932c357d0e6a279a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4efff322911b224e727dc6df9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 15 21:50:14 2008 +0100 rpcrt4: Test and fix I_RpcExceptionFilter. --- dlls/rpcrt4/rpcrt4_main.c | 10 ++++++++-- dlls/rpcrt4/tests/rpc.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 02e1dcd..0fddc28 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -944,8 +944,14 @@ int WINAPI I_RpcExceptionFilter(ULONG ExceptionCode) TRACE("0x%x\n", ExceptionCode); switch (ExceptionCode) { - case EXCEPTION_ACCESS_VIOLATION: - case EXCEPTION_ILLEGAL_INSTRUCTION: + case STATUS_DATATYPE_MISALIGNMENT: + case STATUS_BREAKPOINT: + case STATUS_ACCESS_VIOLATION: + case STATUS_ILLEGAL_INSTRUCTION: + case STATUS_PRIVILEGED_INSTRUCTION: + case STATUS_INSTRUCTION_MISALIGNMENT: + case STATUS_STACK_OVERFLOW: + case STATUS_POSSIBLE_DEADLOCK: return EXCEPTION_CONTINUE_SEARCH; default: return EXCEPTION_EXECUTE_HANDLER; diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index ace8aff..9fd9993 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -610,6 +610,46 @@ static void test_RpcStringBindingParseA(void) ok(options == NULL, "options was %p instead of NULL\n", options); } +static void test_I_RpcExceptionFilter(void) +{ + ULONG exception; + int retval; + int (WINAPI *pI_RpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandle("rpcrt4.dll"), "I_RpcExceptionFilter"); + + if (!pI_RpcExceptionFilter) + { + skip("I_RpcExceptionFilter not exported\n"); + return; + } + + for (exception = 0; exception < STATUS_REG_NAT_CONSUMPTION; exception++) + { + /* skip over uninteresting bits of the number space */ + if (exception == 2000) exception = 0x40000000; + if (exception == 0x40000005) exception = 0x80000000; + if (exception == 0x80000005) exception = 0xc0000000; + + retval = pI_RpcExceptionFilter(exception); + switch (exception) + { + case STATUS_DATATYPE_MISALIGNMENT: + case STATUS_BREAKPOINT: + case STATUS_ACCESS_VIOLATION: + case STATUS_ILLEGAL_INSTRUCTION: + case STATUS_PRIVILEGED_INSTRUCTION: + case 0xc00000aa /* STATUS_INSTRUCTION_MISALIGNMENT */: + case STATUS_STACK_OVERFLOW: + case 0xc0000194 /* STATUS_POSSIBLE_DEADLOCK */: + ok(retval == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); + break; + default: + ok(retval == EXCEPTION_EXECUTE_HANDLER, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); + } + } +} + START_TEST( rpc ) { trace ( " ** Uuid Conversion and Comparison Tests **\n" ); @@ -620,4 +660,5 @@ START_TEST( rpc ) test_towers(); test_I_RpcMapWin32Status(); test_RpcStringBindingParseA(); + test_I_RpcExceptionFilter(); }

1 0

Rob Shearman : widl: Change alls calls to error in the parser to error_loc so that line number information is printed .
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 4b56ff7238b6a2bc12489694693d6ac3c301f775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b56ff7238b6a2bc124896946… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 15 21:52:35 2008 +0100 widl: Change alls calls to error in the parser to error_loc so that line number information is printed. --- tools/widl/parser.y | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fba941e..45471bb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1190,7 +1190,7 @@ static expr_t *make_expr1(enum expr_type type, expr_t *expr) { expr_t *e; if (type == EXPR_ADDRESSOF && expr->type != EXPR_IDENTIFIER) - error("address-of operator applied to invalid expression\n"); + error_loc("address-of operator applied to invalid expression\n"); e = xmalloc(sizeof(expr_t)); e->type = type; e->ref = expr; @@ -1394,7 +1394,7 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ } } else if (!arr && ptr_attr) - error("%s: pointer attribute applied to non-pointer type\n", v->name); + error_loc("%s: pointer attribute applied to non-pointer type\n", v->name); } if (pident && pident->is_func) { @@ -1416,7 +1416,7 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) { if (sizeless) - error("%s: only the first array dimension can be unspecified\n", v->name); + error_loc("%s: only the first array dimension can be unspecified\n", v->name); if (dim->is_const) { @@ -1424,10 +1424,10 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ size_t size = type_memsize(v->type, &align); if (dim->cval <= 0) - error("%s: array dimension must be positive\n", v->name); + error_loc("%s: array dimension must be positive\n", v->name); if (0xffffffffuL / size < (unsigned long) dim->cval) - error("%s: total array size is too large\n", v->name); + error_loc("%s: total array size is too large\n", v->name); else if (0xffffuL < size * dim->cval) v->type = make_type(RPC_FC_LGFARRAY, v->type); else @@ -1453,10 +1453,10 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ atype = *ptype = duptype(*ptype, 0); if (atype->type == RPC_FC_SMFARRAY || atype->type == RPC_FC_LGFARRAY) - error("%s: cannot specify size_is for a fixed sized array\n", v->name); + error_loc("%s: cannot specify size_is for a fixed sized array\n", v->name); if (atype->type != RPC_FC_CARRAY && !is_ptr(atype)) - error("%s: size_is attribute applied to illegal type\n", v->name); + error_loc("%s: size_is attribute applied to illegal type\n", v->name); atype->type = RPC_FC_CARRAY; atype->size_is = dim; @@ -1464,7 +1464,7 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ ptype = &(*ptype)->ref; if (*ptype == NULL) - error("%s: too many expressions in size_is attribute\n", v->name); + error_loc("%s: too many expressions in size_is attribute\n", v->name); } ptype = &v->type; @@ -1482,14 +1482,14 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ else if (atype->type == RPC_FC_CARRAY) atype->type = RPC_FC_CVARRAY; else - error("%s: length_is attribute applied to illegal type\n", v->name); + error_loc("%s: length_is attribute applied to illegal type\n", v->name); atype->length_is = dim; } ptype = &(*ptype)->ref; if (*ptype == NULL) - error("%s: too many expressions in length_is attribute\n", v->name); + error_loc("%s: too many expressions in length_is attribute\n", v->name); } if (has_varconf && !last_array(v->type))

1 0

Andrew Talbot : browseui: Fix handle leak.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 160945e217bee92db266c8d8f19466978384f577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=160945e217bee92db266c8d8f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 15 22:11:26 2008 +0100 browseui: Fix handle leak. --- dlls/browseui/progressdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index c5465a3..c65a097 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -324,6 +324,7 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, hThread = CreateThread(NULL, 0, dialog_thread, &params, 0, NULL); WaitForSingleObject(params.hEvent, INFINITE); + CloseHandle(hThread); This->hwndDisabledParent = NULL; if (hwndParent && (dwFlags & PROGDLG_MODAL)) {

1 0

Andrew Talbot : dinput: Fix handle leak.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 6657cfe70de94bf6ebd345800ef2eec8d4e04bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6657cfe70de94bf6ebd345800… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 15 22:54:03 2008 +0100 dinput: Fix handle leak. --- dlls/dinput/joystick_linux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index e9b8790..5e87a02 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -151,6 +151,8 @@ static INT find_joystick_devices(void) if ((fd = open(device_name, O_RDONLY)) < 0) continue; } + close(fd); + if (!(str = HeapAlloc(GetProcessHeap(), 0, len))) break; memcpy(str, device_name, len);

1 0

Alexandre Julliard : wine.inf: Use a proper services section to install services.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: a0bbf8477cddff241064d54de44f24a515a8712f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0bbf8477cddff241064d54de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 16 12:38:41 2008 +0200 wine.inf: Use a proper services section to install services. --- tools/wine.inf.in | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 9f120b9..2600a47 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -75,6 +75,14 @@ AddReg=\ Timezones,\ VersionInfo +[DefaultInstall.Services] +AddService=MountMgr,0x800,MountMgrService +AddService=Spooler,0,SpoolerService + +[DefaultInstall.NT.Services] +AddService=MountMgr,0x800,MountMgrService +AddService=Spooler,0,SpoolerService + [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32" @@ -84,7 +92,6 @@ CurrentVersion="Software\Microsoft\Windows\CurrentVersion" CurrentVersionNT="Software\Microsoft\Windows NT\CurrentVersion" FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" Control="System\CurrentControlSet\Control" -Services="System\CurrentControlSet\Services" [Classes] HKCR,.avi,"Content Type",2,"video/avi" @@ -2658,22 +2665,25 @@ HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Dlt",,"Yakutsk Dayligh HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"Std",,"Yakutsk Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Yakutsk Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +[MountMgrService] +Description="Device mounting service" +DisplayName="Mount Manager" +ServiceBinary="%12%\mountmgr.sys" +ServiceType=1 +StartType=2 +ErrorControl=1 + +[SpoolerService] +Description="Loads files to memory for later printing" +DisplayName="Print Spooler" +ServiceBinary="%11\spoolsv.exe" +ServiceType=1 +StartType=4 +ErrorControl=1 +LoadOrderGroup="SpoolerGroup" + [Services] -HKLM,"%Services%\Spooler","Description",,"Loads files to memory for later printing." -HKLM,"%Services%\Spooler","DisplayName",,"Print Spooler" -HKLM,"%Services%\Spooler","ErrorControl",0x10001,1 -HKLM,"%Services%\Spooler","Group",,"SpoolerGroup" -HKLM,"%Services%\Spooler","ImagePath",,"spoolsv.exe" -HKLM,"%Services%\Spooler","ObjectName",,"LocalSystem" -HKLM,"%Services%\Spooler","Start",0x10001,4 -HKLM,"%Services%\Spooler","Type",0x10001,0x110 -HKLM,"%Services%\MountMgr","Description",,"Device mounting service." -HKLM,"%Services%\MountMgr","DisplayName",,"Mount Manager" -HKLM,"%Services%\MountMgr","ErrorControl",0x10001,1 -HKLM,"%Services%\MountMgr","ImagePath",,"mountmgr.sys" -HKLM,"%Services%\MountMgr","Start",0x10001,2 -HKLM,"%Services%\MountMgr","Type",0x10001,1 -HKLM,"%Services%\VxD\MSTCP",,,"" +HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,,"" [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"

1 0

Alexandre Julliard : fusion: Fix a number of leaks in assembly_create.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: c889716979326795d32df106425f94f844ff3465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c889716979326795d32df1064… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 16 13:51:17 2008 +0200 fusion: Fix a number of leaks in assembly_create. --- dlls/fusion/assembly.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index d3512e7..024e611 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -343,40 +343,52 @@ HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) *out = NULL; - assembly = HeapAlloc(GetProcessHeap(), 0, sizeof(ASSEMBLY)); + assembly = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ASSEMBLY)); if (!assembly) return E_OUTOFMEMORY; - ZeroMemory(assembly, sizeof(ASSEMBLY)); - assembly->path = strdupWtoA(file); if (!assembly->path) - return E_OUTOFMEMORY; + { + hr = E_OUTOFMEMORY; + goto failed; + } assembly->hfile = CreateFileW(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (!assembly->hfile) - return HRESULT_FROM_WIN32(GetLastError()); + if (assembly->hfile == INVALID_HANDLE_VALUE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } assembly->hmap = CreateFileMappingW(assembly->hfile, NULL, PAGE_READONLY, 0, 0, NULL); if (!assembly->hmap) - return HRESULT_FROM_WIN32(GetLastError()); + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } assembly->data = MapViewOfFile(assembly->hmap, FILE_MAP_READ, 0, 0, 0); if (!assembly->data) - return HRESULT_FROM_WIN32(GetLastError()); + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } hr = parse_pe_header(assembly); - if (FAILED(hr)) - return hr; + if (FAILED(hr)) goto failed; hr = parse_clr_metadata(assembly); - if (FAILED(hr)) - return hr; + if (FAILED(hr)) goto failed; *out = assembly; return S_OK; + +failed: + assembly_release( assembly ); + return hr; } HRESULT assembly_release(ASSEMBLY *assembly)

1 0