May 2011 - Wine-Commits - list.winehq.org

Marcus Meissner : kernel32: Pass in a real string to SetLocaleInfoA, not a function pointer (Coverity).
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: d2dd407eb91e894e7e0fc6aa861514e3c42de297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2dd407eb91e894e7e0fc6aa8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 29 23:31:03 2011 +0200 kernel32: Pass in a real string to SetLocaleInfoA, not a function pointer (Coverity). --- dlls/kernel32/tests/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1268c1d..e13247e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2440,13 +2440,13 @@ static void test_SetLocaleInfoA(void) /* IDATE */ SetLastError(0); - bRet = SetLocaleInfoA(lcid, LOCALE_IDATE, (LPSTR)test_SetLocaleInfoA); + bRet = SetLocaleInfoA(lcid, LOCALE_IDATE, "test_SetLocaleInfoA"); ok(!bRet && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); /* ILDATE */ SetLastError(0); - bRet = SetLocaleInfoA(lcid, LOCALE_ILDATE, (LPSTR)test_SetLocaleInfoA); + bRet = SetLocaleInfoA(lcid, LOCALE_ILDATE, "test_SetLocaleInfoA"); ok(!bRet && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); }

1 0

Hans Leidekker : uninstaller: Don't list system components.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 3de8370a4e9c98590fcf95c3421a10fde830d292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de8370a4e9c98590fcf95c34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 09:28:45 2011 +0200 uninstaller: Don't list system components. --- programs/uninstaller/main.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index c85bf5a..e3178db 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -60,7 +60,7 @@ static const WCHAR PathUninstallW[] = { 'U','n','i','n','s','t','a','l','l',0 }; static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l','S','t','r','i','n','g',0}; static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; - +static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; /** * Used to output program list when used with --list @@ -176,19 +176,27 @@ static int FetchFromRootKey(HKEY root) { HKEY hkeyApp; int i; - DWORD sizeOfSubKeyName, displen, uninstlen; + DWORD sizeOfSubKeyName, displen, uninstlen, value, type, size; WCHAR subKeyName[256]; sizeOfSubKeyName = 255; for (i=0; RegEnumKeyExW( root, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL ) != ERROR_NO_MORE_ITEMS; ++i) { RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); + if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &type, (LPBYTE)&value, &size) && + type == REG_DWORD && value == 1) + { + RegCloseKey(hkeyApp); + sizeOfSubKeyName = 255; + continue; + } if (!RegQueryValueExW(hkeyApp, DisplayNameW, NULL, NULL, NULL, &displen)) { - DWORD value, type; WCHAR *command; - if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &type, NULL, &value) && type == REG_DWORD && value == 1) + size = sizeof(value); + if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &type, (LPBYTE)&value, &size) && + type == REG_DWORD && value == 1) { static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + lstrlenW(subKeyName)) * sizeof(WCHAR));

1 0

Alistair Leslie-Hughes : dbghelp: Add stubs SymFromIndex, SymFromIndexW.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 5d01166f9699eddfa1d793f2ab5f676c19a142dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d01166f9699eddfa1d793f2a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 19 21:58:53 2011 +1000 dbghelp: Add stubs SymFromIndex, SymFromIndexW. --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/symbol.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 398847f..c50ab22 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -72,8 +72,8 @@ @ stdcall SymFindFileInPathW(long wstr wstr ptr long long long ptr ptr ptr) @ stdcall SymFromAddr(ptr int64 ptr ptr) @ stdcall SymFromAddrW(ptr int64 ptr ptr) -@ stub SymFromIndex -@ stub SymFromIndexW +@ stdcall SymFromIndex(long int64 long ptr) +@ stdcall SymFromIndexW(long int64 long ptr) @ stdcall SymFromName(long str ptr) @ stub SymFromNameW @ stub SymFromToken diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 16923e4..4682c85 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2087,3 +2087,27 @@ BOOL WINAPI SymGetLineFromNameW64(HANDLE hProcess, PCWSTR ModuleName, PCWSTR Fil dwLineNumber, plDisplacement, Line); return FALSE; } + +/****************************************************************** + * SymFromIndex (DBGHELP.@) + * + */ +BOOL WINAPI SymFromIndex(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBOL_INFO symbol) +{ + FIXME("hProcess = %p, BaseOfDll = %s, index = %d, symbol = %p\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), index, symbol); + + return FALSE; +} + +/****************************************************************** + * SymFromIndexW (DBGHELP.@) + * + */ +BOOL WINAPI SymFromIndexW(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBOL_INFOW symbol) +{ + FIXME("hProcess = %p, BaseOfDll = %s, index = %d, symbol = %p\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), index, symbol); + + return FALSE; +}

1 0

Hans Leidekker : msi: Skip files from global assemblies in the RemoveFiles action.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 1d6540bdc8bac62b759870cbb3da99c8005adca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6540bdc8bac62b759870cbb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 09:27:53 2011 +0200 msi: Skip files from global assemblies in the RemoveFiles action. --- dlls/msi/files.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8b2feb9..2ea119e 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1164,7 +1164,10 @@ static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) TRACE("Skipping removal due to install mode\n"); return ERROR_SUCCESS; } - + if (comp->assembly && !comp->assembly->application) + { + return ERROR_SUCCESS; + } if (comp->Attributes & msidbComponentAttributesPermanent) { TRACE("permanent component, not removing file\n"); @@ -1266,15 +1269,19 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) MSIRECORD *uirow; LPWSTR dir, p; VS_FIXEDFILEINFO *ver; + MSICOMPONENT *comp = file->Component; if ( file->state == msifs_installed ) ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); - file->Component->Action = msi_get_component_action( package, file->Component ); - if (file->Component->Action != INSTALLSTATE_ABSENT || file->Component->Installed == INSTALLSTATE_SOURCE) + comp->Action = msi_get_component_action( package, comp ); + if (comp->Action != INSTALLSTATE_ABSENT || comp->Installed == INSTALLSTATE_SOURCE) + continue; + + if (comp->assembly && !comp->assembly->application) continue; - if (file->Component->Attributes & msidbComponentAttributesPermanent) + if (comp->Attributes & msidbComponentAttributesPermanent) { TRACE("permanent component, not removing file\n"); continue; @@ -1299,7 +1306,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { WARN("failed to delete %s (%u)\n", debugstr_w(file->TargetPath), GetLastError()); } - else if (!has_persistent_dir( package, file->Component )) + else if (!has_persistent_dir( package, comp )) { if ((dir = strdupW( file->TargetPath ))) { @@ -1312,7 +1319,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) uirow = MSI_CreateRecord( 9 ); MSI_RecordSetStringW( uirow, 1, file->FileName ); - MSI_RecordSetStringW( uirow, 9, file->Component->Directory ); + MSI_RecordSetStringW( uirow, 9, comp->Directory ); msi_ui_actiondata( package, szRemoveFiles, uirow ); msiobj_release( &uirow->hdr ); /* FIXME: call msi_ui_progress here? */

1 0

Michael Stefaniuc : shell32: COM cleanup in autocomplete.c.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: cd3cdf62266612e665433a7cbc23fc9928155893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3cdf62266612e665433a7cb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 30 13:57:12 2011 +0200 shell32: COM cleanup in autocomplete.c. --- dlls/shell32/autocomplete.c | 58 ++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 8db542a..af450ba 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { - const IAutoComplete2Vtbl *lpVtbl; - const IAutoCompleteDropDownVtbl *lpDropDownVtbl; + IAutoComplete2 IAutoComplete2_iface; + IAutoCompleteDropDown IAutoCompleteDropDown_iface; LONG ref; BOOL initialized; BOOL enabled; @@ -85,16 +85,15 @@ static const IAutoCompleteDropDownVtbl acdropdownvt; static const WCHAR autocomplete_propertyW[] = {'W','i','n','e',' ','A','u','t','o', 'c','o','m','p','l','e','t','e',' ', 'c','o','n','t','r','o','l',0}; -/* - converts This to an interface pointer -*/ -#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) -#define _IAutoComplete2_(This) ((IAutoComplete2*)&(This)->lpVtbl) -#define _IAutoCompleteDropDown_(This) (&(This)->lpDropDownVtbl) + +static inline IAutoCompleteImpl *impl_from_IAutoComplete2(IAutoComplete2 *iface) +{ + return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoComplete2_iface); +} static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDropDown *iface) { - return (IAutoCompleteImpl *)((char *)iface - FIELD_OFFSET(IAutoCompleteImpl, lpDropDownVtbl)); + return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -134,13 +133,13 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO return E_OUTOFMEMORY; lpac->ref = 1; - lpac->lpVtbl = &acvt; - lpac->lpDropDownVtbl = &acdropdownvt; + lpac->IAutoComplete2_iface.lpVtbl = &acvt; + lpac->IAutoCompleteDropDown_iface.lpVtbl = &acdropdownvt; lpac->enabled = TRUE; lpac->options = ACO_AUTOAPPEND; - hr = IUnknown_QueryInterface(_IUnknown_ (lpac), riid, ppv); - IUnknown_Release(_IUnknown_ (lpac)); + hr = IAutoComplete2_QueryInterface(&lpac->IAutoComplete2_iface, riid, ppv); + IAutoComplete2_Release(&lpac->IAutoComplete2_iface); TRACE("-- (%p)->\n",lpac); @@ -155,8 +154,8 @@ static HRESULT WINAPI IAutoComplete2_fnQueryInterface( REFIID riid, LPVOID *ppvObj) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); + TRACE("(%p)->(IID:%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); *ppvObj = NULL; @@ -168,7 +167,7 @@ static HRESULT WINAPI IAutoComplete2_fnQueryInterface( } else if (IsEqualIID(riid, &IID_IAutoCompleteDropDown)) { - *ppvObj = _IAutoCompleteDropDown_(This); + *ppvObj = &This->IAutoCompleteDropDown_iface; } if (*ppvObj) @@ -187,9 +186,9 @@ static HRESULT WINAPI IAutoComplete2_fnQueryInterface( static ULONG WINAPI IAutoComplete2_fnAddRef( IAutoComplete2 * iface) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); ULONG refCount = InterlockedIncrement(&This->ref); - + TRACE("(%p)->(%u)\n", This, refCount - 1); return refCount; @@ -201,7 +200,7 @@ static ULONG WINAPI IAutoComplete2_fnAddRef( static ULONG WINAPI IAutoComplete2_fnRelease( IAutoComplete2 * iface) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(%u)\n", This, refCount + 1); @@ -224,8 +223,7 @@ static HRESULT WINAPI IAutoComplete2_fnEnable( IAutoComplete2 * iface, BOOL fEnable) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); HRESULT hr = S_OK; TRACE("(%p)->(%s)\n", This, (fEnable)?"true":"false"); @@ -245,7 +243,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); TRACE("(%p)->(%p, %p, %s, %s)\n", This, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); @@ -274,7 +272,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->hwndEdit = hwndEdit; This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); /* Keep at least one reference to the object until the edit window is destroyed. */ - IAutoComplete2_AddRef((IAutoComplete2 *)This); + IAutoComplete2_AddRef(&This->IAutoComplete2_iface); SetPropW( hwndEdit, autocomplete_propertyW, This ); if (This->options & ACO_AUTOSUGGEST) @@ -326,10 +324,9 @@ static HRESULT WINAPI IAutoComplete2_fnGetOptions( IAutoComplete2 * iface, DWORD *pdwFlag) { + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); HRESULT hr = S_OK; - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - TRACE("(%p) -> (%p)\n", This, pdwFlag); *pdwFlag = This->options; @@ -344,10 +341,9 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( IAutoComplete2 * iface, DWORD dwFlag) { + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); HRESULT hr = S_OK; - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - TRACE("(%p) -> (0x%x)\n", This, dwFlag); This->options = dwFlag; @@ -434,19 +430,19 @@ static HRESULT WINAPI IAutoCompleteDropDown_fnQueryInterface(IAutoCompleteDropDo REFIID riid, LPVOID *ppvObj) { IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); - return IAutoComplete2_fnQueryInterface(_IAutoComplete2_(This), riid, ppvObj); + return IAutoComplete2_fnQueryInterface(&This->IAutoComplete2_iface, riid, ppvObj); } static ULONG WINAPI IAutoCompleteDropDown_fnAddRef(IAutoCompleteDropDown *iface) { IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); - return IAutoComplete2_fnAddRef(_IAutoComplete2_(This)); + return IAutoComplete2_fnAddRef(&This->IAutoComplete2_iface); } static ULONG WINAPI IAutoCompleteDropDown_fnRelease(IAutoCompleteDropDown *iface) { IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); - return IAutoComplete2_fnRelease(_IAutoComplete2_(This)); + return IAutoComplete2_fnRelease(&This->IAutoComplete2_iface); } /************************************************************************** @@ -636,7 +632,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, This->hwndEdit = NULL; if (This->hwndListBox) DestroyWindow(This->hwndListBox); - IAutoComplete2_Release((IAutoComplete2 *)This); + IAutoComplete2_Release(&This->IAutoComplete2_iface); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); } default:

1 0

Alexandre Julliard : widl: Array dimensions have to be constants.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 968c8688c49dc62eca51f6b6a00087246c2bb1eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=968c8688c49dc62eca51f6b6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 28 13:39:18 2011 +0200 widl: Array dimensions have to be constants. --- dlls/rpcrt4/tests/server.idl | 2 +- tools/widl/parser.y | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 2605c12..56bf1a5 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -157,7 +157,7 @@ cpp_quote("#endif") int sum_cs(cs_t *cs); int sum_cps(cps_t *cps); int sum_cpsc(cpsc_t *cpsc); - int sum_complex_array(int n, refpint_t pi[n]); + int sum_complex_array(int n, [size_is(n)] refpint_t pi[]); typedef [wire_marshal(int)] void *puint_t; int square_puint(puint_t p); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fc1076f..6f0cf8c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -452,8 +452,12 @@ arg: attributes decl_spec m_any_declarator { if ($2->stgclass != STG_NONE && $ } ; -array: '[' m_expr ']' { $$ = $2; } +array: '[' expr ']' { $$ = $2; + if (!$$->is_const) + error_loc("array dimension is not an integer constant\n"); + } | '[' '*' ']' { $$ = make_expr(EXPR_VOID); } + | '[' ']' { $$ = make_expr(EXPR_VOID); } ; m_attributes: { $$ = NULL; } @@ -638,16 +642,6 @@ m_exprs: m_expr { $$ = append_expr( NULL, $1 ); | m_exprs ',' m_expr { $$ = append_expr( $1, $3 ); } ; -/* -exprs: { $$ = make_expr(EXPR_VOID); } - | expr_list - ; - -expr_list: expr - | expr_list ',' expr { LINK($3, $1); $$ = $3; } - ; -*/ - m_expr: { $$ = make_expr(EXPR_VOID); } | expr ;

1 0

Marcus Meissner : ntdll: Specify div to be divl.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: a73a6e0cded6b49de05af9eca69199a96b89adb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73a6e0cded6b49de05af9eca… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 29 20:59:01 2011 +0200 ntdll: Specify div to be divl. Avoids a clang bug. --- dlls/ntdll/large_int.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index cb98bae..54ce6b0 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -264,7 +264,7 @@ UINT WINAPI RtlEnlargedUnsignedDivide( ULONGLONG a, UINT b, UINT *remptr ) p1 = a >> 32; p2 = a & 0xffffffffLL; - __asm__("div %4,%%eax" + __asm__("divl %4,%%eax" : "=a" (ret), "=d" (rem) : "0" (p2), "1" (p1), "g" (b) ); if (remptr) *remptr = rem;

1 0

Alexandre Julliard : winapi: Support optional parameters for stubs.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 9a21e823ffc599d09b4c620be5be8a5472f22f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a21e823ffc599d09b4c620be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 27 21:01:16 2011 +0200 winapi: Support optional parameters for stubs. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 965c766..4a8d101 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -391,7 +391,7 @@ sub parse_spec_file($$) { } } } - } elsif(/^(\d+|@)\s+stub(?:\s+(-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-private))*\s+(\S+)$/) { + } elsif(/^(\d+|@)\s+stub(?:\s+(-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-private))*\s+(\S+?)\s*($\s*(.*?)\s*$)?$/) { $ordinal = $1; my $flags = $2;

1 0

Gerald Pfeifer : imm32: Simplify find_window where we do not need to consider the return value of EnumChildWindows .
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 4a0a1d19f8e1df51528846a3acba852164244b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a0a1d19f8e1df51528846a3a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 27 23:42:11 2011 +0200 imm32: Simplify find_window where we do not need to consider the return value of EnumChildWindows. --- dlls/comdlg32/tests/itemdlg.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 6663936..208ec8c 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1290,9 +1290,8 @@ static BOOL CALLBACK find_window_callback(HWND hwnd, LPARAM lparam) static HWND find_window(HWND parent, LPCWSTR class, LPCWSTR text) { struct fw_arg arg = {class, text, NULL}; - BOOL br; - br = EnumChildWindows(parent, find_window_callback, (LPARAM)&arg); + EnumChildWindows(parent, find_window_callback, (LPARAM)&arg); return arg.hwnd_res; }

1 0

Marcus Meissner : comdlg32: Mark one vtable as static.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: be47d0674426449f45d266fa0cf8b84134fcb2c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be47d0674426449f45d266fa0… Author: Marcus Meissner <meissner(a)suse.de> Date: Sat May 28 10:49:30 2011 +0200 comdlg32: Mark one vtable as static. --- dlls/comdlg32/itemdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 7e9d0a1..354e952 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -3530,7 +3530,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemText(IFileDialogCusto return E_NOTIMPL; } -const IFileDialogCustomizeVtbl vt_IFileDialogCustomize = { +static const IFileDialogCustomizeVtbl vt_IFileDialogCustomize = { IFileDialogCustomize_fnQueryInterface, IFileDialogCustomize_fnAddRef, IFileDialogCustomize_fnRelease,

1 0