wine-commits December 2007

wine-commits@winehq.org

3 participants
824 discussions

Rob Shearman : include: Make RpcRaiseException DECLSPEC_NORETURN, like it is in the PSDK.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: c8a802eea885d7858028002f43fedba89d2e9672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a802eea885d7858028002f4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 13 16:11:06 2007 +0000 include: Make RpcRaiseException DECLSPEC_NORETURN, like it is in the PSDK. --- dlls/rpcrt4/rpcrt4_main.c | 6 ++++-- include/rpcdce.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index d9efe9a..7cd9b03 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -239,10 +239,12 @@ RPC_STATUS WINAPI RpcStringFreeW(RPC_WSTR* String) * * Raises an exception. */ -void WINAPI RpcRaiseException(RPC_STATUS exception) +void DECLSPEC_NORETURN WINAPI RpcRaiseException(RPC_STATUS exception) { - /* FIXME: translate exception? */ + /* shouldn't return */ RaiseException(exception, 0, 0, NULL); + ERR("handler continued execution\n"); + ExitProcess(1); } /************************************************************************* diff --git a/include/rpcdce.h b/include/rpcdce.h index 7f20900..1b8b6e7 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -289,7 +289,7 @@ RPC_STATUS RPC_ENTRY DceErrorInqTextA(RPC_STATUS e, RPC_CSTR buffer); RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS e, RPC_WSTR buffer); #define DceErrorInqText WINELIB_NAME_AW(DceErrorInqText) -RPCRTAPI void RPC_ENTRY +RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException( RPC_STATUS exception ); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Aric Stewart : cryptnet: InternetCrackUrlW requires component buffers when used with ICU_DECODE.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 1f98ede4f01147f3efcf0b41e45b95d857512cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f98ede4f01147f3efcf0b41e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 14 16:55:19 2007 +0900 cryptnet: InternetCrackUrlW requires component buffers when used with ICU_DECODE. --- dlls/cryptnet/cryptnet_main.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 0ad302d..eba8648 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -476,18 +476,16 @@ static BOOL CRYPT_CrackUrl(LPCWSTR pszURL, URL_COMPONENTSW *components) memset(components, 0, sizeof(*components)); components->dwStructSize = sizeof(*components); - components->dwHostNameLength = 1; - components->dwUrlPathLength = 1; + components->lpszHostName = CryptMemAlloc(MAX_PATH * sizeof(WCHAR)); + components->dwHostNameLength = MAX_PATH; + components->lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); + components->dwUrlPathLength = 2 * MAX_PATH; ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, components); if (ret) { - LPWSTR hostname = strndupW(components->lpszHostName, - components->dwHostNameLength); - LPWSTR path = strndupW(components->lpszUrlPath, - components->dwUrlPathLength); - - components->lpszHostName = hostname; - components->lpszUrlPath = path; + if ((components->dwUrlPathLength == 2 * MAX_PATH - 1) || + (components->dwHostNameLength == MAX_PATH - 1)) + FIXME("Buffers are too small\n"); switch (components->nScheme) { case INTERNET_SCHEME_FTP: @@ -873,12 +871,16 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, *ppfnFreeObject = CRYPT_FreeBlob; *ppvFreeContext = NULL; - components.dwUrlPathLength = 1; + components.lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); + components.dwUrlPathLength = 2 * MAX_PATH; ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, &components); if (ret) { LPWSTR path; + if (components.dwUrlPathLength == 2 * MAX_PATH - 1) + FIXME("Buffers are too small\n"); + /* 3 == lstrlenW(L"c:") + 1 */ path = CryptMemAlloc((components.dwUrlPathLength + 3) * sizeof(WCHAR)); if (path) @@ -932,6 +934,7 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, CryptMemFree(path); } } + CryptMemFree(components.lpszUrlPath); return ret; } @@ -952,7 +955,7 @@ static BOOL CRYPT_GetRetrieveFunction(LPCWSTR pszURL, *pFunc = NULL; *phFunc = 0; components.dwSchemeLength = 1; - ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, &components); + ret = InternetCrackUrlW(pszURL, 0, 0, &components); if (ret) { /* Microsoft always uses CryptInitOIDFunctionSet/

1 0

Rob Shearman : rpcrt4: Fix a typo in rpcrt4_conn_tcp_read.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: ba280fb1b040fc2b4c43f8b7ee353ee6933ab59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba280fb1b040fc2b4c43f8b7e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 14 09:30:50 2007 +0000 rpcrt4: Fix a typo in rpcrt4_conn_tcp_read. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index ea49b77..e4d12c3 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -977,7 +977,7 @@ static int rpcrt4_conn_tcp_read(RpcConnection *Connection, pfds[0].fd = tcpc->sock; pfds[0].events = POLLIN; pfds[1].fd = tcpc->cancel_fds[0]; - pfds[1].fd = POLLIN; + pfds[1].events = POLLIN; if (poll(pfds, 2, -1 /* infinite */) == -1 && errno != EINTR) { ERR("poll() failed: %s\n", strerror(errno));

1 0

Maarten Lankhorst : riched20: Make some functions static.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 4637a4ef49b56dfb3bbe7a3bebb26160e0e30e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4637a4ef49b56dfb3bbe7a3be… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Dec 14 07:45:28 2007 +0100 riched20: Make some functions static. --- dlls/riched20/editor.h | 4 ---- dlls/riched20/wrap.c | 10 ++++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 010494a..8757e45 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -211,10 +211,6 @@ ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor); BOOL ME_UpdateSelection(ME_TextEditor *editor, const ME_Cursor *pTempCursor); /* wrap.c */ -void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp); -ME_DisplayItem *ME_MakeRow(int height, int baseline, int width); -void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd); -void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp); BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor); void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor); void ME_SendRequestResize(ME_TextEditor *editor, BOOL force); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 946aa73..467ce8a 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); * - no tabs */ -ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) +static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) { ME_DisplayItem *item = ME_MakeDI(diStartRow); @@ -51,7 +51,7 @@ static void ME_BeginRow(ME_WrapContext *wc) wc->pt.x = 0; } -void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) +static void ME_InsertRowStart(ME_WrapContext *wc, const ME_DisplayItem *pEnd) { ME_DisplayItem *p, *row, *para; int ascent = 0, descent = 0, width=0, shift = 0, align = 0; @@ -336,7 +336,9 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) return p->next; } -void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { +static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp); + +static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { ME_DisplayItem *p; ME_WrapContext wc; int dpi = GetDeviceCaps(c->hDC, LOGPIXELSX); @@ -379,7 +381,7 @@ void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { } -void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { +static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { ME_DisplayItem *p, *pRow; /* remove all items that will be reinserted by paragraph wrapper anyway */

1 0

Maarten Lankhorst : winealsa: Add 'Front Mic' as alias for microphone.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 483e3be2e662616e79deade581d4ecb22333daf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483e3be2e662616e79deade58… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Dec 14 07:44:41 2007 +0100 winealsa: Add 'Front Mic' as alias for microphone. --- dlls/winealsa.drv/mixer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 90b539e..5065518 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -210,6 +210,7 @@ static const struct mixerlinetype { { "Line", MIXERLINE_COMPONENTTYPE_SRC_LINE, }, { "Phone", MIXERLINE_COMPONENTTYPE_SRC_TELEPHONE, }, { "Digital", MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE, }, + { "Front Mic", MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE, }, }; /* Map name to MIXERLINE_COMPONENTTYPE_XXX */

1 0

Alistair Leslie-Hughes : msxml3: Fix memory leak in tests.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 497c2949c709db76167b1515d9471629ad685d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=497c2949c709db76167b1515d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 14 13:44:52 2007 +1100 msxml3: Fix memory leak in tests. --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 41208f2..8b4f546 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -415,7 +415,7 @@ static void test_domdoc( void ) ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); /* content doesn't matter here */ - str = SysAllocString( szNonExistentFile ); + str = NULL; r = IXMLDOMDocument_get_nodeName( doc, &str ); ok ( r == S_OK, "get_nodeName wrong code\n"); ok ( str != NULL, "str is null\n"); @@ -670,7 +670,7 @@ todo_wine ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); /* content doesn't matter here */ - str = SysAllocString( szNonExistentFile ); + str = NULL; r = IXMLDOMNode_get_nodeName( node, &str ); ok ( r == S_OK, "get_nodeName wrong code\n"); ok ( str != NULL, "str is null\n");

1 0

James Hawkins : msi: Close the file handle returned by FindFirstFile.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: fa8476e7f6943749184bfef0e4e741bd6e429698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8476e7f6943749184bfef0e… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 13 18:38:33 2007 -0600 msi: Close the file handle returned by FindFirstFile. --- dlls/msi/action.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 89f7bd7..2da9f13 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5194,8 +5194,8 @@ BOOL move_files_wildcard(LPWSTR source, LPWSTR dest, int options) path = wildcard_to_file(source, wfd.cFileName); if (!path) { - free_list(&files); - return FALSE; + res = FALSE; + goto done; } add_wildcard(&files, path, dest); @@ -5208,8 +5208,8 @@ BOOL move_files_wildcard(LPWSTR source, LPWSTR dest, int options) file->dest = msi_realloc(file->dest, size * sizeof(WCHAR)); if (!file->dest) { - free_list(&files); - return FALSE; + res = FALSE; + goto done; } lstrcpyW(strrchrW(file->dest, '\\') + 1, file->destname); @@ -5224,7 +5224,12 @@ BOOL move_files_wildcard(LPWSTR source, LPWSTR dest, int options) free_file_entry(file); } - return TRUE; + res = TRUE; + +done: + free_list(&files); + FindClose(hfile); + return res; } static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param )

1 0

Michael Stefaniuc : winebuild: Remove duplicate declaration of variable 'j' .
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: e94bcee53f52d70488fe58465989423ee25d976e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94bcee53f52d70488fe58465… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 14 00:18:30 2007 +0100 winebuild: Remove duplicate declaration of variable 'j'. --- tools/winebuild/spec16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 2b62721..dc86b1b 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -686,7 +686,7 @@ void BuildSpec16File( DLLSPEC *spec ) for ( i = 0; i < nb_funcs; i++ ) { unsigned int arg_types[2]; - int j, nop_words, argsize = 0; + int nop_words, argsize = 0; if ( typelist[i]->type == TYPE_PASCAL ) argsize = get_function_argsize( typelist[i] );

1 0

Michael Stefaniuc : kernel32: Do not reuse the name of a function argument for a local variable.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 8c6fdf19a9b2c68bbeae177be138bbca7837120c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6fdf19a9b2c68bbeae177be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 14 00:18:21 2007 +0100 kernel32: Do not reuse the name of a function argument for a local variable. --- dlls/kernel32/utthunk.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/utthunk.c b/dlls/kernel32/utthunk.c index a142216..55ff733 100644 --- a/dlls/kernel32/utthunk.c +++ b/dlls/kernel32/utthunk.c @@ -167,8 +167,8 @@ static UTINFO *UTAlloc( HMODULE hModule, HMODULE16 hModule16, if ( !UTGlue16_Segptr ) { - HMODULE16 hModule = GetModuleHandle16( "KERNEL" ); - UTGlue16_Segptr = GetProcAddress16( hModule, "UTGlue16" ); + HMODULE16 hMod = GetModuleHandle16( "KERNEL" ); + UTGlue16_Segptr = GetProcAddress16( hMod, "UTGlue16" ); if ( !UTGlue16_Segptr ) return NULL; }

1 0

Michael Stefaniuc : wineoss.drv: Move a function wide variable down to the block it is used in.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: aff83e69db9930af63f0c2f3a4b3e3e753e9e960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff83e69db9930af63f0c2f3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 14 00:18:05 2007 +0100 wineoss.drv: Move a function wide variable down to the block it is used in. --- dlls/wineoss.drv/mixer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index 22f580f..34588f9 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -1063,7 +1063,7 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, DWORD fdwDetails) { DWORD ret = MMSYSERR_NOTSUPPORTED; - DWORD c, chnl; + DWORD chnl; struct mixer* mix; TRACE("(%04X, %p, %u);\n", wDevID, lpmcd, fdwDetails); @@ -1084,7 +1084,7 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, TRACE("MIXER_GETCONTROLDETAILSF_VALUE (%08x)\n", lpmcd->dwControlID); if (MIX_CheckControl(mix, lpmcd->dwControlID)) { - c = lpmcd->dwControlID - 1; + DWORD c = lpmcd->dwControlID - 1; chnl = HIWORD(mix->ctrl[c].dwLineID); if (chnl == LINEID_DST) chnl = LOWORD(mix->ctrl[c].dwLineID) ? SOUND_MIXER_RECLEV : @@ -1221,7 +1221,7 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd, ret = MMSYSERR_INVALPARAM; if (MIX_CheckControl(mix, lpmcd->dwControlID)) { - int c = lpmcd->dwControlID - 1; + DWORD c = lpmcd->dwControlID - 1; if (mix->ctrl[c].ctrl.dwControlType == MIXERCONTROL_CONTROLTYPE_MUX || mix->ctrl[c].ctrl.dwControlType == MIXERCONTROL_CONTROLTYPE_MIXER)

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2007