December 2008 - Wine-Commits

Francois Gouget : wineoss.drv: Make widOpen() and wodOpen() static.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: f5bc44322c9a595553850273ebe09687cd439e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5bc44322c9a595553850273e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:24:01 2008 +0100 wineoss.drv: Make widOpen() and wodOpen() static. --- dlls/wineoss.drv/audio.c | 4 ++-- dlls/wineoss.drv/audio.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index a008236..111b9d1 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1958,7 +1958,7 @@ static DWORD wodGetDevCaps(WORD wDevID, LPWAVEOUTCAPSW lpCaps, DWORD dwSize) /************************************************************************** * wodOpen [internal] */ -DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) +static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) { int audio_fragment; WINE_WAVEOUT* wwo; @@ -2848,7 +2848,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) /************************************************************************** * widOpen [internal] */ -DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) +static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) { WINE_WAVEIN* wwi; audio_buf_info info; diff --git a/dlls/wineoss.drv/audio.h b/dlls/wineoss.drv/audio.h index f039084..1038a8f 100644 --- a/dlls/wineoss.drv/audio.h +++ b/dlls/wineoss.drv/audio.h @@ -174,9 +174,7 @@ extern DWORD OSS_OpenDevice(OSS_DEVICE* ossdev, unsigned req_access, extern void OSS_CloseDevice(OSS_DEVICE* ossdev); -extern DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags); extern DWORD wodSetVolume(WORD wDevID, DWORD dwParam); -extern DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags); /* dscapture.c */ extern DWORD widDsCreate(UINT wDevID, PIDSCDRIVER* drv);

1 0

Francois Gouget : userenv/tests: Make userenv_dbgstr_w() static.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 8dbc8d3b9d64b9ae59dc21dc59613c4df9cc6970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dbc8d3b9d64b9ae59dc21dc5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:25:10 2008 +0100 userenv/tests: Make userenv_dbgstr_w() static. --- dlls/userenv/tests/userenv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 49491f7..0b5e034 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -118,7 +118,7 @@ const char *wine_dbgstr_w( const WCHAR *s ) return default_dbgstr_wn( s, -1, TRUE); } -const char *userenv_dbgstr_w( const WCHAR *s ) +static const char *userenv_dbgstr_w( const WCHAR *s ) { return default_dbgstr_wn( s, -1, FALSE); }

1 0

Francois Gouget : kernel32: Remove _hread16() as it is not used. Move _hwrite16() next to the other related functions.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 7271ed55327d50375b305f67994743d57461e12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7271ed55327d50375b305f679… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:28:09 2008 +0100 kernel32: Remove _hread16() as it is not used. Move _hwrite16() next to the other related functions. --- dlls/kernel32/file16.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/file16.c b/dlls/kernel32/file16.c index 9d90d85..ad30903 100644 --- a/dlls/kernel32/file16.c +++ b/dlls/kernel32/file16.c @@ -336,6 +336,15 @@ UINT16 WINAPI WIN16_lread( HFILE16 hFile, SEGPTR buffer, UINT16 count ) /*********************************************************************** + * _hwrite (KERNEL.350) + */ +LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count ) +{ + return _hwrite( (HFILE)DosFileHandleToWin32Handle(hFile), buffer, count ); +} + + +/*********************************************************************** * GetTempDrive (KERNEL.92) * A closer look at krnl386.exe shows what the SDK doesn't mention: * @@ -531,24 +540,6 @@ UINT16 WINAPI SetHandleCount16( UINT16 count ) /*********************************************************************** - * _hread16 (KERNEL.349) - */ -LONG WINAPI _hread16( HFILE16 hFile, LPVOID buffer, LONG count) -{ - return _lread( (HFILE)DosFileHandleToWin32Handle(hFile), buffer, count ); -} - - -/*********************************************************************** - * _hwrite (KERNEL.350) - */ -LONG WINAPI _hwrite16( HFILE16 hFile, LPCSTR buffer, LONG count ) -{ - return _hwrite( (HFILE)DosFileHandleToWin32Handle(hFile), buffer, count ); -} - - -/*********************************************************************** * WritePrivateProfileStruct (KERNEL.406) */ BOOL16 WINAPI WritePrivateProfileStruct16 (LPCSTR section, LPCSTR key,

1 0

Francois Gouget : msvcrt: Point the set_new_handler() entrypoint to the right implementation.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 05c082270763036e1223e9b81031a70be29e07a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c082270763036e1223e9b81… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:23:47 2008 +0100 msvcrt: Point the set_new_handler() entrypoint to the right implementation. --- dlls/msvcrt/msvcrt.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 78ad88c..7a9c654 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -45,7 +45,7 @@ @ cdecl -i386 -norelay ?before(a)type_info@@QBEHABV1@@Z(ptr) __thiscall_MSVCRT_type_info_before @ cdecl -i386 -norelay ?name(a)type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_name @ cdecl -i386 -norelay ?raw_name(a)type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_raw_name -@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ(a)Z(ptr) MSVCRT__set_new_handler +@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ(a)Z(ptr) MSVCRT_set_new_handler @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ(a)Z(ptr) MSVCRT_set_terminate @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ(a)Z(ptr) MSVCRT_set_unexpected @ cdecl ?terminate@@YAXXZ() MSVCRT_terminate

1 0

Francois Gouget : user32/tests: Make some functions static.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 803555927c64bc3ca8326b9393f91e3a1788af5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=803555927c64bc3ca8326b939… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:22:24 2008 +0100 user32/tests: Make some functions static. --- dlls/user32/tests/edit.c | 2 +- dlls/user32/tests/msg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index f6dc918..46cbb87 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2001,7 +2001,7 @@ static void UnregisterWindowClasses (void) UnregisterClassA(szEditTextPositionClass, hinst); } -void test_fontsize(void) +static void test_fontsize(void) { HWND hwEdit; HFONT hfont; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f4496a7..9ad9fde 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5310,7 +5310,7 @@ static void register_wmime_keydown_class(void) if (!RegisterClassA(&cls)) assert(0); } -void test_wmime_keydown_message(void) +static void test_wmime_keydown_message(void) { HWND hwnd; MSG msg; @@ -7114,7 +7114,7 @@ static LRESULT WINAPI ShowWindowProcA(HWND hwnd, UINT message, WPARAM wParam, LP return ret; } -LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) {

1 0

Francois Gouget : ole32/tests: Make test_runnable() static.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 0b1d8be03714749087f84f71d2097f03c2b09b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1d8be03714749087f84f71d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:22:12 2008 +0100 ole32/tests: Make test_runnable() static. --- dlls/ole32/tests/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index cc3476d..99b8acb 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1481,7 +1481,7 @@ static void test_default_handler(void) IOleObject_Release(pObject); } -void test_runnable(void) +static void test_runnable(void) { static const char *methods_query_runnable[] = {

1 0

Francois Gouget : shell32/tests: Make test_cbsize() static.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: 596311cd5de176096e62ce86dd41784a656d7805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=596311cd5de176096e62ce86d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:21:52 2008 +0100 shell32/tests: Make test_cbsize() static. --- dlls/shell32/tests/systray.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index 23a6614..1f505ec 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -28,7 +28,7 @@ static HWND hMainWnd; static BOOL (WINAPI *pShell_NotifyIconW)(DWORD,PNOTIFYICONDATAW); -void test_cbsize(void) +static void test_cbsize(void) { NOTIFYICONDATAA nidA; BOOL ret;

1 0

Francois Gouget : msvcrt/tests: Make void test_cp_table() static.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: b455d319f92dcd3ea1667207c0cd1cb8d101db19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b455d319f92dcd3ea1667207c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:21:22 2008 +0100 msvcrt/tests: Make void test_cp_table() static. --- dlls/msvcrt/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index fdd2580..bf1a302 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -146,7 +146,7 @@ static int result_cp_950_mbctype[] = { 0x0,65, 0x8,1, 0x18,26, 0x8,6, 0x28,26, 0 static int todo_none[] = { -2 }; static int todo_cp_932[] = { 254, -2 }; -void test_cp_table(int cp, int *result, int *todo) +static void test_cp_table(int cp, int *result, int *todo) { int i; int count = 0;

1 0

Francois Gouget : ntdll/tests: Make rtlraiseexception_vectored_handler() static.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: e9e8fbd0effc93d30c5d90a9b3c6e95e26f93805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e8fbd0effc93d30c5d90a9b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:21:38 2008 +0100 ntdll/tests: Make rtlraiseexception_vectored_handler() static. --- dlls/ntdll/tests/exception.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 1cb687d..b0cb554 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -199,7 +199,7 @@ static void run_exception_test(void *handler, const void* context, pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; } -LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +static LONG CALLBACK rtlraiseexception_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) { PCONTEXT context = ExceptionInfo->ContextRecord; PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord;

1 0

Francois Gouget : gdi32/tests: Make test_GdiAlphaBlend() static.
by Alexandre Julliard Dec. 12, 2008

Dec. 12, 2008

Module: wine Branch: master Commit: f5657080c7a60ff9181fe5ed66aba7462820ce6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5657080c7a60ff9181fe5ed6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 12 10:21:11 2008 +0100 gdi32/tests: Make test_GdiAlphaBlend() static. --- dlls/gdi32/tests/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 76547d3..7683d35 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2131,7 +2131,7 @@ static void test_get16dibits(void) ReleaseDC(NULL, screen_dc); } -void test_GdiAlphaBlend() +static void test_GdiAlphaBlend(void) { /* test out-of-bound parameters for GdiAlphaBlend */ HDC hdcNull;

1 0