January 2009 - Wine-commits

Francois Gouget : regedit: Make some functions static.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 5898a5c767dc0f560f6854e638bbb75a504dff0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5898a5c767dc0f560f6854e63… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 26 12:53:12 2009 +0100 regedit: Make some functions static. --- programs/regedit/childwnd.c | 2 +- programs/regedit/regproc.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 6f9d487..74c8b66 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -37,7 +37,7 @@ static int last_split; * Local module support methods */ -LPCWSTR GetRootKeyName(HKEY hRootKey) +static LPCWSTR GetRootKeyName(HKEY hRootKey) { if(hRootKey == HKEY_CLASSES_ROOT) return reg_class_namesW[INDEX_HKEY_CLASSES_ROOT]; diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 018a58e..47f9832 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -89,7 +89,7 @@ WCHAR* GetWideString(const char* strA) * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller */ -WCHAR* GetWideStringN(const char* strA, int chars, DWORD *len) +static WCHAR* GetWideStringN(const char* strA, int chars, DWORD *len) { if(strA) { @@ -128,7 +128,7 @@ char* GetMultiByteString(const WCHAR* strW) * Allocates memory and converts input from wide chars to multibyte * Returned string must be freed by the caller */ -char* GetMultiByteStringN(const WCHAR* strW, int chars, DWORD* len) +static char* GetMultiByteStringN(const WCHAR* strW, int chars, DWORD* len) { if(strW) { @@ -611,7 +611,7 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) * Parameters: * in - input stream to read from */ -void processRegLinesA(FILE *in) +static void processRegLinesA(FILE *in) { LPSTR line = NULL; /* line read from input stream */ ULONG lineSize = REG_VAL_BUF_SIZE; @@ -726,7 +726,7 @@ void processRegLinesA(FILE *in) HeapFree(GetProcessHeap(), 0, line); } -void processRegLinesW(FILE *in) +static void processRegLinesW(FILE *in) { WCHAR* buf = NULL; /* line read from input stream */ ULONG lineSize = REG_VAL_BUF_SIZE;

1 0

Francois Gouget : winecfg: Make enumerate_valuesW() static.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 0e01daa3e71a1bb110f46e130b5644feeed5ddc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e01daa3e71a1bb110f46e130… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 26 12:52:34 2009 +0100 winecfg: Make enumerate_valuesW() static. --- programs/winecfg/winecfg.c | 2 +- programs/winecfg/winecfg.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 543daf1..1abf8ed 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -478,7 +478,7 @@ void set_reg_key_dwordW(HKEY root, const WCHAR *path, const WCHAR *name, DWORD v * you are expected to HeapFree each element of the array, which is null * terminated, as well as the array itself. */ -WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) +static WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) { HKEY key; DWORD res, i = 0, valueslen = 0; diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 43fb278..f929500 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -54,7 +54,6 @@ extern WCHAR* current_app; /* NULL means editing global settings */ void set_reg_keyW(HKEY root, const WCHAR *path, const WCHAR *name, const WCHAR *value); void set_reg_key_dwordW(HKEY root, const WCHAR *path, const WCHAR *name, DWORD value); WCHAR *get_reg_keyW(HKEY root, const WCHAR *path, const WCHAR *name, const WCHAR *def); -WCHAR **enumerate_valuesW(HKEY root, WCHAR *path); void set_reg_key(HKEY root, const char *path, const char *name, const char *value); void set_reg_key_dword(HKEY root, const char *path, const char *name, DWORD value);

1 0

Francois Gouget : wineconsole: WINECON_GetHistory{Mode,Size}() are unused so remove them.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 0a6665bfefefacef4821177b09603d2dbf30be8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6665bfefefacef4821177b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 26 12:51:37 2009 +0100 wineconsole: WINECON_GetHistory{Mode,Size}() are unused so remove them. --- programs/wineconsole/wineconsole.c | 37 ------------------------------------ 1 files changed, 0 insertions(+), 37 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 1c146df..0e57176 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -102,24 +102,6 @@ void WINECON_NotifyWindowChange(struct inner_data* data) } /****************************************************************** - * WINECON_GetHistorySize - * - * - */ -int WINECON_GetHistorySize(HANDLE hConIn) -{ - int ret = 0; - - SERVER_START_REQ(get_console_input_info) - { - req->handle = wine_server_obj_handle( hConIn ); - if (!wine_server_call_err( req )) ret = reply->history_size; - } - SERVER_END_REQ; - return ret; -} - -/****************************************************************** * WINECON_SetHistorySize * * @@ -139,25 +121,6 @@ static BOOL WINECON_SetHistorySize(HANDLE hConIn, int size) return ret; } - -/****************************************************************** - * WINECON_GetHistoryMode - * - * - */ -int WINECON_GetHistoryMode(HANDLE hConIn) -{ - int ret = 0; - - SERVER_START_REQ(get_console_input_info) - { - req->handle = wine_server_obj_handle( hConIn ); - if (!wine_server_call_err( req )) ret = reply->history_mode; - } - SERVER_END_REQ; - return ret; -} - /****************************************************************** * WINECON_SetHistoryMode *

1 0

Francois Gouget : quartz: Make the IMemInputPin functions static.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 8be5798e3f2f7b9be0b34f8c4c29bd51282ce89c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be5798e3f2f7b9be0b34f8c4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 26 12:50:31 2009 +0100 quartz: Make the IMemInputPin functions static. --- dlls/quartz/pin.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 78116fc..bdfccd7 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -536,28 +536,28 @@ static inline InputPin *impl_from_IMemInputPin( IMemInputPin *iface ) return (InputPin *)((char*)iface - FIELD_OFFSET(InputPin, lpVtblMemInput)); } -HRESULT WINAPI MemInputPin_QueryInterface(IMemInputPin * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI MemInputPin_QueryInterface(IMemInputPin * iface, REFIID riid, LPVOID * ppv) { InputPin *This = impl_from_IMemInputPin(iface); return IPin_QueryInterface((IPin *)&This->pin, riid, ppv); } -ULONG WINAPI MemInputPin_AddRef(IMemInputPin * iface) +static ULONG WINAPI MemInputPin_AddRef(IMemInputPin * iface) { InputPin *This = impl_from_IMemInputPin(iface); return IPin_AddRef((IPin *)&This->pin); } -ULONG WINAPI MemInputPin_Release(IMemInputPin * iface) +static ULONG WINAPI MemInputPin_Release(IMemInputPin * iface) { InputPin *This = impl_from_IMemInputPin(iface); return IPin_Release((IPin *)&This->pin); } -HRESULT WINAPI MemInputPin_GetAllocator(IMemInputPin * iface, IMemAllocator ** ppAllocator) +static HRESULT WINAPI MemInputPin_GetAllocator(IMemInputPin * iface, IMemAllocator ** ppAllocator) { InputPin *This = impl_from_IMemInputPin(iface); @@ -570,7 +570,7 @@ HRESULT WINAPI MemInputPin_GetAllocator(IMemInputPin * iface, IMemAllocator ** p return *ppAllocator ? S_OK : VFW_E_NO_ALLOCATOR; } -HRESULT WINAPI MemInputPin_NotifyAllocator(IMemInputPin * iface, IMemAllocator * pAllocator, BOOL bReadOnly) +static HRESULT WINAPI MemInputPin_NotifyAllocator(IMemInputPin * iface, IMemAllocator * pAllocator, BOOL bReadOnly) { InputPin *This = impl_from_IMemInputPin(iface); @@ -598,7 +598,7 @@ HRESULT WINAPI MemInputPin_NotifyAllocator(IMemInputPin * iface, IMemAllocator * return S_OK; } -HRESULT WINAPI MemInputPin_GetAllocatorRequirements(IMemInputPin * iface, ALLOCATOR_PROPERTIES * pProps) +static HRESULT WINAPI MemInputPin_GetAllocatorRequirements(IMemInputPin * iface, ALLOCATOR_PROPERTIES * pProps) { InputPin *This = impl_from_IMemInputPin(iface); @@ -609,7 +609,7 @@ HRESULT WINAPI MemInputPin_GetAllocatorRequirements(IMemInputPin * iface, ALLOCA return E_NOTIMPL; } -HRESULT WINAPI MemInputPin_Receive(IMemInputPin * iface, IMediaSample * pSample) +static HRESULT WINAPI MemInputPin_Receive(IMemInputPin * iface, IMediaSample * pSample) { InputPin *This = impl_from_IMemInputPin(iface); HRESULT hr; @@ -620,7 +620,7 @@ HRESULT WINAPI MemInputPin_Receive(IMemInputPin * iface, IMediaSample * pSample) return hr; } -HRESULT WINAPI MemInputPin_ReceiveMultiple(IMemInputPin * iface, IMediaSample ** pSamples, long nSamples, long *nSamplesProcessed) +static HRESULT WINAPI MemInputPin_ReceiveMultiple(IMemInputPin * iface, IMediaSample ** pSamples, long nSamples, long *nSamplesProcessed) { HRESULT hr = S_OK; InputPin *This = impl_from_IMemInputPin(iface); @@ -637,7 +637,7 @@ HRESULT WINAPI MemInputPin_ReceiveMultiple(IMemInputPin * iface, IMediaSample ** return hr; } -HRESULT WINAPI MemInputPin_ReceiveCanBlock(IMemInputPin * iface) +static HRESULT WINAPI MemInputPin_ReceiveCanBlock(IMemInputPin * iface) { InputPin *This = impl_from_IMemInputPin(iface);

1 0

Alexandre Julliard : rpcrt4: Don' t align the buffer pointer in ComplexStructMemorySize for alignment formats .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 9876c5433f7db052e25d16c594856058c3c37934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9876c5433f7db052e25d16c59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 26 15:12:07 2009 +0100 rpcrt4: Don't align the buffer pointer in ComplexStructMemorySize for alignment formats. --- dlls/rpcrt4/ndr_marshall.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1ec412d..d1f231d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3148,11 +3148,9 @@ static unsigned long ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, } case RPC_FC_ALIGNM4: ALIGN_LENGTH(size, 4); - ALIGN_POINTER(pStubMsg->Buffer, 4); break; case RPC_FC_ALIGNM8: ALIGN_LENGTH(size, 8); - ALIGN_POINTER(pStubMsg->Buffer, 8); break; case RPC_FC_STRUCTPAD1: case RPC_FC_STRUCTPAD2:

1 0

Alexandre Julliard : winex11: Flush the display after releasing the capture to make sure it happens right away .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 95cf00f30b5fb155fa5297a784a0edb0f34232c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95cf00f30b5fb155fa5297a78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 26 15:12:55 2009 +0100 winex11: Flush the display after releasing the capture to make sure it happens right away. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99156b6..31800f7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1958,6 +1958,7 @@ void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) wine_tsx11_lock(); XFlush( gdi_display ); XUngrabPointer( thread_data->display, CurrentTime ); + XFlush( thread_data->display ); wine_tsx11_unlock(); thread_data->grab_window = None; }

1 0

Alexandre Julliard : gdi32: Avoid some pointer casts.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 3939cb5c821b7ac5b0681450ec85076fa4d5c712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3939cb5c821b7ac5b0681450e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 26 15:09:18 2009 +0100 gdi32: Avoid some pointer casts. --- dlls/gdi32/freetype.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ec78045..1ca6953 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2555,7 +2555,6 @@ BOOL WineEngInit(void) static const WCHAR pathW[] = {'P','a','t','h',0}; HKEY hkey; DWORD valuelen, datalen, i = 0, type, dlen, vlen; - LPVOID data; WCHAR windowsdir[MAX_PATH]; char *unixname; HANDLE font_mutex; @@ -2605,7 +2604,7 @@ BOOL WineEngInit(void) if(RegOpenKeyW(HKEY_LOCAL_MACHINE, is_win9x() ? win9x_font_reg_key : winnt_font_reg_key, &hkey) == ERROR_SUCCESS) { - LPWSTR valueW; + LPWSTR data, valueW; RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &valuelen, &datalen, NULL, NULL); @@ -2616,17 +2615,17 @@ BOOL WineEngInit(void) { dlen = datalen * sizeof(WCHAR); vlen = valuelen; - while(RegEnumValueW(hkey, i++, valueW, &vlen, NULL, &type, data, + while(RegEnumValueW(hkey, i++, valueW, &vlen, NULL, &type, (LPBYTE)data, &dlen) == ERROR_SUCCESS) { - if(((LPWSTR)data)[0] && ((LPWSTR)data)[1] == ':') + if(data[0] && (data[1] == ':')) { - if((unixname = wine_get_unix_file_name((LPWSTR)data))) + if((unixname = wine_get_unix_file_name(data))) { AddFontFileToList(unixname, NULL, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unixname); } } - else if(dlen / 2 >= 6 && !strcmpiW(((LPWSTR)data) + dlen / 2 - 5, dot_fonW)) + else if(dlen / 2 >= 6 && !strcmpiW(data + dlen / 2 - 5, dot_fonW)) { WCHAR pathW[MAX_PATH]; static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'};

1 0

Alexandre Julliard : user32: Make sure the submenu is valid in MENU_HideSubPopups.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 7d657ed8f44c12b58c88ecd97471ecde245ae0c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d657ed8f44c12b58c88ecd97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 26 15:09:07 2009 +0100 user32: Make sure the submenu is valid in MENU_HideSubPopups. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 05596af..efb14c6 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2298,7 +2298,7 @@ static void MENU_HideSubPopups( HWND hwndOwner, HMENU hmenu, hsubmenu = item->hSubMenu; } else return; - submenu = MENU_GetMenu( hsubmenu ); + if (!(submenu = MENU_GetMenu( hsubmenu ))) return; MENU_HideSubPopups( hwndOwner, hsubmenu, FALSE, wFlags ); MENU_SelectItem( hwndOwner, hsubmenu, NO_SELECTED_ITEM, sendMenuSelect, 0 ); DestroyWindow( submenu->hWnd );

1 0

Alexandre Julliard : user32: Use a finally handler to make sure capture is always released when exiting the menu loop .
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: f12c5bfca3a1f00a07bc4aede53f9fceddd8e8f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12c5bfca3a1f00a07bc4aede… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 26 15:08:49 2009 +0100 user32: Use a finally handler to make sure capture is always released when exiting the menu loop. --- dlls/user32/menu.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 3fbb941..05596af 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -56,6 +56,7 @@ #include "wownt32.h" #include "wine/server.h" #include "wine/unicode.h" +#include "wine/exception.h" #include "win.h" #include "controls.h" #include "user_private.h" @@ -2964,6 +2965,11 @@ static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags ) } } +static void CALLBACK release_capture( BOOL __normal ) +{ + set_capture_window( 0, GUI_INMENUMODE, NULL ); +} + /*********************************************************************** * MENU_TrackMenu * @@ -3011,7 +3017,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, capture_win = (wFlags & TPM_POPUPMENU) ? menu->hWnd : mt.hOwnerWnd; set_capture_window( capture_win, GUI_INMENUMODE, NULL ); - while (!fEndMenu) + __TRY while (!fEndMenu) { menu = MENU_GetMenu( mt.hCurrentMenu ); if (!menu) /* sometimes happens if I do a window manager close */ @@ -3232,8 +3238,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, PeekMessageW( &msg, 0, msg.message, msg.message, PM_REMOVE ); else mt.trackFlags &= ~TF_SKIPREMOVE; } - - set_capture_window( 0, GUI_INMENUMODE, NULL ); + __FINALLY( release_capture ) /* If dropdown is still painted and the close box is clicked on then the menu will be destroyed as part of the DispatchMessage above.

1 0

Alexandre Julliard : include: Update the comments about the Wine exception macros.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 58010a9750f3cc199fc59e7db6ac234ed411913d URL: http://source.winehq.org/git/wine.git/?a=commit;h=58010a9750f3cc199fc59e7db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 26 15:07:50 2009 +0100 include: Update the comments about the Wine exception macros. --- include/wine/exception.h | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 7e0d5bc..007688f 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -37,7 +37,7 @@ extern "C" { * { * do some stuff that can raise an exception * } - * __EXCEPT(filter_func,param) + * __EXCEPT(filter_func) * { * handle the exception here * } @@ -49,14 +49,17 @@ extern "C" { * { * do some stuff that can raise an exception * } - * __FINALLY(finally_func,param) + * __FINALLY(finally_func) * - * The filter_func must be defined with the WINE_EXCEPTION_FILTER - * macro, and return one of the EXCEPTION_* code; it can use - * GetExceptionInformation and GetExceptionCode to retrieve the - * exception info. + * The filter_func and finally_func functions must be defined like this: + * + * LONG CALLBACK filter_func( PEXCEPTION_POINTERS __eptr ) { ... } * - * The finally_func must be defined with the WINE_FINALLY_FUNC macro. + * void CALLBACK finally_func( BOOL __normal ) { ... } + * + * The filter function must return one of the EXCEPTION_* code; it can + * use GetExceptionInformation() and GetExceptionCode() to retrieve the + * exception info. * * Warning: inside a __TRY or __EXCEPT block, 'break' or 'continue' statements * break out of the current block. You cannot use 'return', 'goto'

1 0