December 2007 - Wine-commits

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 : 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

Maarten Lankhorst : include: Update oleacc with new constants and IAccessible interface.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 1733875f013c0c14e91bb916971247dbd26a67ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1733875f013c0c14e91bb9169… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Thu Dec 13 18:37:10 2007 +0100 include: Update oleacc with new constants and IAccessible interface. --- include/oleacc.idl | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 146 insertions(+), 2 deletions(-) diff --git a/include/oleacc.idl b/include/oleacc.idl index 239d2d5..e92f9fd 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -18,6 +18,146 @@ import "oaidl.idl"; +cpp_quote("#define NAVDIR_UP 1") +cpp_quote("#define NAVDIR_DOWN 2") +cpp_quote("#define NAVDIR_LEFT 3") +cpp_quote("#define NAVDIR_RIGHT 4") +cpp_quote("#define NAVDIR_NEXT 5") +cpp_quote("#define NAVDIR_PREVIOUS 6") +cpp_quote("#define NAVDIR_FIRSTCHILD 7") +cpp_quote("#define NAVDIR_LASTCHILD 8") + +cpp_quote("#define ROLE_SYSTEM_TITLEBAR 1") +cpp_quote("#define ROLE_SYSTEM_MENUBAR 2") +cpp_quote("#define ROLE_SYSTEM_SCROLLBAR 3") +cpp_quote("#define ROLE_SYSTEM_GRIP 4") +cpp_quote("#define ROLE_SYSTEM_SOUND 5") +cpp_quote("#define ROLE_SYSTEM_CURSOR 6") +cpp_quote("#define ROLE_SYSTEM_CARET 7") +cpp_quote("#define ROLE_SYSTEM_ALERT 8") +cpp_quote("#define ROLE_SYSTEM_WINDOW 9") +cpp_quote("#define ROLE_SYSTEM_CLIENT 10") +cpp_quote("#define ROLE_SYSTEM_MENUPOPUP 11") +cpp_quote("#define ROLE_SYSTEM_MENUITEM 12") +cpp_quote("#define ROLE_SYSTEM_TOOLTIP 13") +cpp_quote("#define ROLE_SYSTEM_APPLICATION 14") +cpp_quote("#define ROLE_SYSTEM_DOCUMENT 15") +cpp_quote("#define ROLE_SYSTEM_PANE 16") +cpp_quote("#define ROLE_SYSTEM_CHART 17") +cpp_quote("#define ROLE_SYSTEM_DIALOG 18") +cpp_quote("#define ROLE_SYSTEM_BORDER 19") +cpp_quote("#define ROLE_SYSTEM_GROUPING 20") +cpp_quote("#define ROLE_SYSTEM_SEPARATOR 21") +cpp_quote("#define ROLE_SYSTEM_TOOLBAR 22") +cpp_quote("#define ROLE_SYSTEM_STATUSBAR 23") +cpp_quote("#define ROLE_SYSTEM_TABLE 24") +cpp_quote("#define ROLE_SYSTEM_COLUMNHEADER 25") +cpp_quote("#define ROLE_SYSTEM_ROWHEADER 26") +cpp_quote("#define ROLE_SYSTEM_COLUMN 27") +cpp_quote("#define ROLE_SYSTEM_ROW 28") +cpp_quote("#define ROLE_SYSTEM_CELL 29") +cpp_quote("#define ROLE_SYSTEM_LINK 30") +cpp_quote("#define ROLE_SYSTEM_HELPBALLOON 31") +cpp_quote("#define ROLE_SYSTEM_CHARACTER 32") +cpp_quote("#define ROLE_SYSTEM_LIST 33") +cpp_quote("#define ROLE_SYSTEM_LISTITEM 34") +cpp_quote("#define ROLE_SYSTEM_OUTLINE 35") +cpp_quote("#define ROLE_SYSTEM_OUTLINEITEM 36") +cpp_quote("#define ROLE_SYSTEM_PAGETAB 37") +cpp_quote("#define ROLE_SYSTEM_PROPERTYPAGE 38") +cpp_quote("#define ROLE_SYSTEM_INDICATOR 39") +cpp_quote("#define ROLE_SYSTEM_GRAPHIC 40") +cpp_quote("#define ROLE_SYSTEM_STATICTEXT 41") +cpp_quote("#define ROLE_SYSTEM_TEXT 42") +cpp_quote("#define ROLE_SYSTEM_PUSHBUTTON 43") +cpp_quote("#define ROLE_SYSTEM_CHECKBUTTON 44") +cpp_quote("#define ROLE_SYSTEM_RADIOBUTTON 45") +cpp_quote("#define ROLE_SYSTEM_COMBOBOX 46") +cpp_quote("#define ROLE_SYSTEM_DROPLIST 47") +cpp_quote("#define ROLE_SYSTEM_PROGRESSBAR 48") +cpp_quote("#define ROLE_SYSTEM_DIAL 49") +cpp_quote("#define ROLE_SYSTEM_HOTKEYFIELD 50") +cpp_quote("#define ROLE_SYSTEM_SLIDER 51") +cpp_quote("#define ROLE_SYSTEM_SPINBUTTON 52") +cpp_quote("#define ROLE_SYSTEM_DIAGRAM 53") +cpp_quote("#define ROLE_SYSTEM_ANIMATION 54") +cpp_quote("#define ROLE_SYSTEM_EQUATION 55") +cpp_quote("#define ROLE_SYSTEM_BUTTONDROPDOWN 56") +cpp_quote("#define ROLE_SYSTEM_BUTTONMENU 57") +cpp_quote("#define ROLE_SYSTEM_BUTTONDROPDOWNGRID 58") +cpp_quote("#define ROLE_SYSTEM_WHITESPACE 59") +cpp_quote("#define ROLE_SYSTEM_PAGETABLIST 60") +cpp_quote("#define ROLE_SYSTEM_CLOCK 61") +cpp_quote("#define ROLE_SYSTEM_SPLITBUTTON 62") +cpp_quote("#define ROLE_SYSTEM_IPADDRESS 63") +cpp_quote("#define ROLE_SYSTEM_OUTLINEBUTTON 64") + +cpp_quote("#define SELFLAG_NONE 0x00") +cpp_quote("#define SELFLAG_TAKEFOCUS 0x01") +cpp_quote("#define SELFLAG_TAKESELECTION 0x02") +cpp_quote("#define SELFLAG_EXTENDSELECTION 0x04") +cpp_quote("#define SELFLAG_ADDSELECTION 0x08") +cpp_quote("#define SELFLAG_REMOVESELECTION 0x10") +cpp_quote("#define SELFLAG_VALID 0x1f") + +[ + local, + object, + uuid(618736e0-3c3d-11cf-810c-00aa00389b71), + pointer_default(unique) +] +interface IAccessible : IDispatch +{ + typedef [unique] IAccessible *LPACCESSIBLE; + const long DISPID_ACC_PARENT = -5000; + const long DISPID_ACC_CHILDCOUNT = -5001; + const long DISPID_ACC_CHILD = -5002; + const long DISPID_ACC_NAME = -5003; + const long DISPID_ACC_VALUE = -5004; + const long DISPID_ACC_DESCRIPTION= -5005; + const long DISPID_ACC_ROLE = -5006; + const long DISPID_ACC_STATE = -5007; + const long DISPID_ACC_HELP = -5008; + const long DISPID_ACC_HELPTOPIC = -5009; + const long DISPID_ACC_KEYBOARDSHORTCUT = -5010; + const long DISPID_ACC_FOCUS = -5011; + const long DISPID_ACC_SELECTION = -5012; + const long DISPID_ACC_DEFAULTACTION = -5013; + const long DISPID_ACC_SELECT = -5014; + const long DISPID_ACC_LOCATION = -5015; + const long DISPID_ACC_NAVIGATE = -5016; + const long DISPID_ACC_HITTEST = -5017; + const long DISPID_ACC_DODEFAULTACTION = -5018; + + [hidden, propget, id(DISPID_ACC_PARENT)] HRESULT accParent([out, retval]IDispatch** ppdispParent); + [hidden, propget, id(DISPID_ACC_CHILDCOUNT)] HRESULT accChildCount([out, retval] long* pcountChildren); + [hidden, propget, id(DISPID_ACC_CHILD)] HRESULT accChild([in] VARIANT varChildID, [out, retval]IDispatch **ppdispChild); + [hidden, propget, id(DISPID_ACC_NAME)] HRESULT accName([in]VARIANT varID, [out, retval] BSTR* pszName); + [hidden, propget, id(DISPID_ACC_VALUE)] HRESULT accValue([in]VARIANT varID, [out, retval] BSTR* pszValue); + [hidden, propget, id(DISPID_ACC_DESCRIPTION)] HRESULT accDescription([in]VARIANT varID, [out, retval] BSTR* pszDescription); + [hidden, propget, id(DISPID_ACC_ROLE)] HRESULT accRole([in]VARIANT varID, [out, retval]VARIANT* pvarRole); + [hidden, propget, id(DISPID_ACC_STATE)] HRESULT accState([in]VARIANT varID, [out, retval]VARIANT* pvarState); + [hidden, propget, id(DISPID_ACC_HELP)] HRESULT accHelp([in]VARIANT varID, [out, retval]BSTR* pszHelp); + [hidden, propget, id(DISPID_ACC_HELPTOPIC)] HRESULT accHelpTopic([out]BSTR* pszHelpFile, [in]VARIANT varID, [out, retval] long* pidTopic); + [hidden, propget, id(DISPID_ACC_KEYBOARDSHORTCUT)] HRESULT accKeyboardShortcut([in]VARIANT varID, [out, retval] BSTR* pszKeyboardShortcut); + [hidden, propget, id(DISPID_ACC_FOCUS)] HRESULT accFocus([out, retval] VARIANT* pvarID); + [hidden, propget, id(DISPID_ACC_SELECTION)] HRESULT accSelection([out, retval] VARIANT* pvarID); + [hidden, propget, id(DISPID_ACC_DEFAULTACTION)] HRESULT accDefaultAction([in]VARIANT varID, [out, retval] BSTR* pszDefaultAction); + + [hidden, id(DISPID_ACC_SELECT)] HRESULT accSelect([in]long flagsSelect, [in]VARIANT varID); + [hidden, id(DISPID_ACC_LOCATION)] HRESULT accLocation([out]long* pxLeft, [out]long* pyTop, [out]long* pcxWidth, [out]long* pcyHeight, [in]VARIANT varID); + [hidden, id(DISPID_ACC_NAVIGATE)] HRESULT accNavigate([in]long navDir, [in]VARIANT varStart, [out, retval] VARIANT* pvarEnd); + [hidden, id(DISPID_ACC_HITTEST)] HRESULT accHitTest([in]long xLeft, [in]long yTop, [out,retval] VARIANT* pvarID); + [hidden, id(DISPID_ACC_DODEFAULTACTION)] HRESULT accDoDefaultAction([in]VARIANT varID); + + [hidden, propput, id(DISPID_ACC_NAME)] HRESULT accName([in]VARIANT varID, [in]BSTR pszName); + [hidden, propput, id(DISPID_ACC_VALUE)] HRESULT accValue([in]VARIANT varID, [out, retval]BSTR pszValue); +} + +cpp_quote("DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b, 0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);") +cpp_quote("DEFINE_GUID(CLSID_AccPropServices, 0xb5f8350b, 0x0548, 0x48b1, 0xa6, 0xee, 0x88, 0xbd, 0x00, 0xb4, 0xa5, 0xe7);") +cpp_quote("DEFINE_GUID(IIS_IsOleaccProxy, 0x902697fa, 0x80e4, 0x4560, 0x80, 0x2a, 0xa1, 0x3f, 0x22, 0xa6, 0x47, 0x09);") + cpp_quote("LRESULT WINAPI LresultFromObject(REFIID,WPARAM,LPUNKNOWN);") cpp_quote("HRESULT WINAPI ObjectFromLresult(LRESULT,REFIID,WPARAM,void **);") cpp_quote("HRESULT WINAPI WindowFromAccessibleObject(IAccessible *,HWND *);") @@ -32,5 +172,9 @@ cpp_quote("HRESULT WINAPI CreateStdAccessibleProxyA(HWND,LPCSTR,LONG,REFIID,void cpp_quote("HRESULT WINAPI CreateStdAccessibleProxyW(HWND,LPCWSTR,LONG,REFIID,void **);") cpp_quote("#define CreateStdAccessibleProxy WINELIB_NAME_AW(CreateStdAccessibleProxy)") -cpp_quote("DEFINE_GUID(CLSID_AccPropServices, 0xB5F8350B,0x0548,0x48B1,0xA6,0xEE,0x88,0xBD,0x00,0xB4,0xA5,0xE7);") -cpp_quote("DEFINE_GUID(IIS_IsOleaccProxy, 0x902697FA,0x80E4,0x4560,0x80,0x2A,0xA1,0x3F,0x22,0xA6,0x47,0x09);") +cpp_quote("UINT WINAPI GetRoleTextA(DWORD,LPSTR,UINT);"); +cpp_quote("UINT WINAPI GetRoleTextW(DWORD,LPWSTR,UINT);"); +cpp_quote("#define GetRoleText WINELIB_NAME_AW(GetRoleText)"); +cpp_quote("UINT WINAPI GetStateTextA(DWORD,LPSTR,UINT);"); +cpp_quote("UINT WINAPI GetStateTextW(DWORD,LPWSTR,UINT);"); +cpp_quote("#define GetStateText WINELIB_NAME_AW(GetStateText)")

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

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

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

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

Michael Stefaniuc : rsaenh/tests: Remove an unused global variable.
by Alexandre Julliard 14 Dec '07

14 Dec '07

Module: wine Branch: master Commit: 8423809f9f83cf5733721b41648786a316c23942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8423809f9f83cf5733721b416… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 14 00:17:43 2007 +0100 rsaenh/tests: Remove an unused global variable. --- dlls/rsaenh/tests/rsaenh.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 6d4f565..5a7b474 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -30,7 +30,6 @@ static HCRYPTPROV hProv; static const char szContainer[] = "winetest"; -static const unsigned char pbData[] = "Wine rocks totally!"; static const char szProvider[] = MS_ENHANCED_PROV_A; typedef struct _ctdatatype {

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

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