marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made some functions and variables static.

oldstable
Eric Pouech 2004-11-29 18:00:10 +00:00 committed by Alexandre Julliard
parent 955c50aa85
commit 5c2a891c43
17 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/avifil32/api.c
View File

@ -1379,8 +1379,8 @@ static void AVISaveOptionsUpdate(HWND hWnd)
}
INT_PTR CALLBACK AVISaveOptionsDlgProc(HWND hWnd, UINT uMsg,
WPARAM wParam, LPARAM lParam)
static INT_PTR CALLBACK AVISaveOptionsDlgProc(HWND hWnd, UINT uMsg,
WPARAM wParam, LPARAM lParam)
{
DWORD dwInterleave;
BOOL bIsInterleaved;

2
dlls/avifil32/icmstream.c
View File

@ -111,7 +111,7 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This,
LPBITMAPINFOHEADER lpbi, LPVOID lpBits);
static HRESULT AVIFILE_OpenGetFrame(IAVIStreamImpl *This);
inline void AVIFILE_Reset(IAVIStreamImpl *This)
static inline void AVIFILE_Reset(IAVIStreamImpl *This)
{
This->lCurrent = -1;
This->lLastKey = 0;

8
dlls/commdlg/printdlg.c
View File

@ -1746,8 +1746,8 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
/***********************************************************************
* PrintDlgProcA [internal]
*/
INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
LPARAM lParam)
static INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
LPARAM lParam)
{
PRINT_PTRA* PrintStructures;
INT_PTR res = FALSE;
@ -1790,8 +1790,8 @@ INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
return res;
}
INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
LPARAM lParam)
static INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
LPARAM lParam)
{
static const WCHAR propW[] = {'_','_','W','I','N','E','_','P','R','I','N','T','D','L','G','D','A','T','A',0};
PRINT_PTRW* PrintStructures;

44
dlls/wininet/internet.c
View File

@ -90,17 +90,17 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUr
LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD dwContext);
static VOID INTERNET_ExecuteWork();
DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES;
DWORD dwNumThreads;
DWORD dwNumIdleThreads;
DWORD dwNumJobs;
HANDLE hEventArray[2];
static DWORD g_dwTlsErrIndex = TLS_OUT_OF_INDEXES;
static DWORD dwNumThreads;
static DWORD dwNumIdleThreads;
static DWORD dwNumJobs;
static HANDLE hEventArray[2];
#define hQuitEvent hEventArray[0]
#define hWorkEvent hEventArray[1]
CRITICAL_SECTION csQueue;
LPWORKREQUEST lpHeadWorkQueue;
LPWORKREQUEST lpWorkQueueTail;
HMODULE WININET_hModule;
static CRITICAL_SECTION csQueue;
static LPWORKREQUEST lpHeadWorkQueue;
static LPWORKREQUEST lpWorkQueueTail;
static HMODULE WININET_hModule;
extern void URLCacheContainers_CreateDefaults();
extern void URLCacheContainers_DeleteAll();
@ -1036,10 +1036,9 @@ BOOL WINAPI InternetCloseHandle(HINTERNET hInternet)
* Helper function for InternetCrackUrlW
*
*/
void ConvertUrlComponentValue(LPSTR* lppszComponent, LPDWORD dwComponentLen,
LPWSTR lpwszComponent, DWORD dwwComponentLen,
LPCSTR lpszStart,
LPCWSTR lpwszStart)
static void ConvertUrlComponentValue(LPSTR* lppszComponent, LPDWORD dwComponentLen,
LPWSTR lpwszComponent, DWORD dwwComponentLen,
LPCSTR lpszStart, LPCWSTR lpwszStart)
{
if (*dwComponentLen != 0)
{
@ -1104,6 +1103,7 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
HeapFree(GetProcessHeap(), 0, lpwszUrl);
return FALSE;
}
ConvertUrlComponentValue(&lpUrlComponents->lpszHostName, &lpUrlComponents->dwHostNameLength,
UCW.lpszHostName, UCW.dwHostNameLength,
lpszUrl, lpwszUrl);
@ -1241,7 +1241,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
if(dwUrlLength==0)
dwUrlLength=strlenW(lpszUrl);
TRACE("\n");
TRACE("(%s %lu %lx %p)\n", debugstr_w(lpszUrl), dwUrlLength, dwFlags, lpUC);
/* Determine if the URI is absolute. */
while (*lpszap != '\0')
@ -1771,7 +1771,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
else
{
memcpy(lpBuffer, &type, sizeof(ULONG));
*lpdwBufferLength = sizeof(ULONG);
*lpdwBufferLength = sizeof(ULONG);
bSuccess = TRUE;
}
break;
@ -1786,7 +1786,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d
else
{
memcpy(lpBuffer, &flags, sizeof(ULONG));
*lpdwBufferLength = sizeof(ULONG);
*lpdwBufferLength = sizeof(ULONG);
bSuccess = TRUE;
}
break;
@ -2391,7 +2391,7 @@ void INTERNET_SetLastError(DWORD dwError)
* RETURNS
*
*/
DWORD INTERNET_GetLastError()
DWORD INTERNET_GetLastError(void)
{
LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex);
return lpwite->dwError;
@ -2406,7 +2406,7 @@ DWORD INTERNET_GetLastError()
* RETURNS
*
*/
DWORD INTERNET_WorkerThreadFunc(LPVOID *lpvParam)
static DWORD INTERNET_WorkerThreadFunc(LPVOID *lpvParam)
{
DWORD dwWaitRes;
@ -2441,7 +2441,7 @@ DWORD INTERNET_WorkerThreadFunc(LPVOID *lpvParam)
* RETURNS
*
*/
BOOL INTERNET_InsertWorkRequest(LPWORKREQUEST lpWorkRequest)
static BOOL INTERNET_InsertWorkRequest(LPWORKREQUEST lpWorkRequest)
{
BOOL bSuccess = FALSE;
LPWORKREQUEST lpNewRequest;
@ -2481,7 +2481,7 @@ BOOL INTERNET_InsertWorkRequest(LPWORKREQUEST lpWorkRequest)
* RETURNS
*
*/
BOOL INTERNET_GetWorkRequest(LPWORKREQUEST lpWorkRequest)
static BOOL INTERNET_GetWorkRequest(LPWORKREQUEST lpWorkRequest)
{
BOOL bSuccess = FALSE;
LPWORKREQUEST lpRequest = NULL;
@ -2560,7 +2560,7 @@ lerror:
* RETURNS
*
*/
static VOID INTERNET_ExecuteWork()
static VOID INTERNET_ExecuteWork(void)
{
WORKREQUEST workRequest;
@ -2786,7 +2786,7 @@ static VOID INTERNET_ExecuteWork()
* RETURNS
*
*/
LPSTR INTERNET_GetResponseBuffer()
LPSTR INTERNET_GetResponseBuffer(void)
{
LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex);
TRACE("\n");

4
dlls/winmm/playsound.c
View File

@ -72,7 +72,7 @@ static HMMIO get_mmioFromProfile(UINT uFlags, LPCWSTR lpszName)
static const WCHAR wszNull[] = {0};
TRACE("searching in SystemSound list for %s\n", debugstr_w(lpszName));
GetProfileStringW(wszSounds, (LPWSTR)lpszName, wszNull, str, sizeof(str)/sizeof(str[0]));
GetProfileStringW(wszSounds, lpszName, wszNull, str, sizeof(str)/sizeof(str[0]));
if (lstrlenW(str) == 0)
{
if (uFlags & SND_NODEFAULT) goto next;
@ -420,7 +420,7 @@ errCleanUp:
return bRet;
}
BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSound, BOOL bUnicode)
static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSound, BOOL bUnicode)
{
WINE_PLAYSOUND* wps = NULL;

6
dlls/winmm/winealsa/audio.c
View File

@ -627,8 +627,6 @@ if (err<0) { \
if (!sw)
return;
}
/* return a string duplicated on the win32 process heap, free with HeapFree */
@ -644,7 +642,7 @@ static char* ALSA_strdup(char *s) {
* Returns either "default" or reads the registry so the user can
* override the playback/record device used.
*/
char *ALSA_GetDeviceFromReg(char *value)
static char *ALSA_GetDeviceFromReg(char *value)
{
DWORD res;
DWORD type;
@ -1323,7 +1321,7 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force)
}
void wait_for_poll(snd_pcm_t *handle, struct pollfd *ufds, unsigned int count)
static void wait_for_poll(snd_pcm_t *handle, struct pollfd *ufds, unsigned int count)
{
unsigned short revents;

2
dlls/winmm/winealsa/midi.c
View File

@ -1084,7 +1084,7 @@ static DWORD modReset(WORD wDevID)
*
* Helper for ALSA_MidiInit
*/
void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, int cap, int type)
static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, int cap, int type)
{
if (cap & SND_SEQ_PORT_CAP_WRITE) {
TRACE("OUT (%d:%s:%s:%d:%s:%x)\n",snd_seq_client_info_get_client(cinfo),

12
dlls/winmm/winearts/audio.c
View File

@ -276,8 +276,8 @@ static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position,
/* Volume functions derived from Alsaplayer source */
/* length is the number of 16 bit samples */
void volume_effect16(void *bufin, void* bufout, int length, int left,
int right, int nChannels)
static void volume_effect16(void *bufin, void* bufout, int length, int left,
int right, int nChannels)
{
short *d_out = (short *)bufout;
short *d_in = (short *)bufin;
@ -302,8 +302,8 @@ void volume_effect16(void *bufin, void* bufout, int length, int left,
}
/* length is the number of 8 bit samples */
void volume_effect8(void *bufin, void* bufout, int length, int left,
int right, int nChannels)
static void volume_effect8(void *bufin, void* bufout, int length, int left,
int right, int nChannels)
{
BYTE *d_out = (BYTE *)bufout;
BYTE *d_in = (BYTE *)bufin;
@ -331,7 +331,7 @@ void volume_effect8(void *bufin, void* bufout, int length, int left,
* ARTS_CloseWaveOutDevice
*
*/
void ARTS_CloseWaveOutDevice(WINE_WAVEOUT* wwo)
static void ARTS_CloseWaveOutDevice(WINE_WAVEOUT* wwo)
{
arts_close_stream(wwo->play_stream); /* close the arts stream */
wwo->play_stream = (arts_stream_t*)-1;
@ -350,7 +350,7 @@ void ARTS_CloseWaveOutDevice(WINE_WAVEOUT* wwo)
* ARTS_CloseWaveInDevice
*
*/
void ARTS_CloseWaveInDevice(WINE_WAVEIN* wwi)
static void ARTS_CloseWaveInDevice(WINE_WAVEIN* wwi)
{
arts_close_stream(wwi->record_stream); /* close the arts stream */
wwi->record_stream = (arts_stream_t*)-1;

13
dlls/winmm/winenas/audio.c
View File

@ -330,11 +330,11 @@ static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position,
/*======================================================================*
* Low level WAVE implementation *
*======================================================================*/
#if 0
/* Volume functions derived from Alsaplayer source */
/* length is the number of 16 bit samples */
void volume_effect16(void *bufin, void* bufout, int length, int left,
int right, int nChannels)
static void volume_effect16(void *bufin, void* bufout, int length, int left,
int right, int nChannels)
{
short *d_out = (short *)bufout;
short *d_in = (short *)bufin;
@ -359,8 +359,8 @@ void volume_effect16(void *bufin, void* bufout, int length, int left,
}
/* length is the number of 8 bit samples */
void volume_effect8(void *bufin, void* bufout, int length, int left,
int right, int nChannels)
static void volume_effect8(void *bufin, void* bufout, int length, int left,
int right, int nChannels)
{
char *d_out = (char *)bufout;
char *d_in = (char *)bufin;
@ -383,12 +383,13 @@ void volume_effect8(void *bufin, void* bufout, int length, int left,
}
}
}
#endif
/******************************************************************
* NAS_CloseDevice
*
*/
void NAS_CloseDevice(WINE_WAVEOUT* wwo)
static void NAS_CloseDevice(WINE_WAVEOUT* wwo)
{
TRACE("NAS_CloseDevice\n");
nas_close(wwo);

2
programs/clock/main.c
View File

@ -320,7 +320,7 @@ static VOID CLOCK_Paint(HWND hWnd)
* CLOCK_WndProc
*/
LRESULT WINAPI CLOCK_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
static LRESULT WINAPI CLOCK_WndProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg) {
/* L button drag moves the window */

2
programs/control/control.c
View File

@ -24,7 +24,7 @@
#include "params.h"
extern void WINAPI Control_RunDLL(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdShow);
void launch(const char *what)
static void launch(const char *what)
{
Control_RunDLL(GetDesktopWindow(), 0, what, SW_SHOW);
exit(0);

2
programs/taskmgr/dbgchnl.c
View File

@ -157,7 +157,7 @@ static int change_channel_CB(HANDLE hProcess, void* addr, char* buffer, void* pm
return 1;
}
void* get_symbol(HANDLE hProcess, char* name, char* lib)
static void* get_symbol(HANDLE hProcess, char* name, char* lib)
{
char buffer[sizeof(IMAGEHLP_SYMBOL) + 256];
SYMBOL_INFO* si = (SYMBOL_INFO*)buffer;

2
programs/view/view.c
View File

@ -31,7 +31,7 @@ int deltax = 0, deltay = 0;
int width = 0, height = 0;
BOOL isAldus;
BOOL FileOpen(HWND hWnd, char *fn, int fnsz)
static BOOL FileOpen(HWND hWnd, char *fn, int fnsz)
{
OPENFILENAME ofn = { sizeof(OPENFILENAME),
0, 0, NULL, NULL, 0, 0, NULL,

8
programs/wcmd/builtins.c
View File

@ -515,7 +515,7 @@ int status;
*
* Make a copy of the environment.
*/
WCHAR *WCMD_dupenv( const WCHAR *env )
static WCHAR *WCMD_dupenv( const WCHAR *env )
{
WCHAR *env_copy;
int len;
@ -575,7 +575,7 @@ void WCMD_setlocal (const char *s) {
/*****************************************************************************
* WCMD_strchrW
*/
inline WCHAR *WCMD_strchrW(WCHAR *str, WCHAR ch)
static inline WCHAR *WCMD_strchrW(WCHAR *str, WCHAR ch)
{
while(*str)
{
@ -757,7 +757,7 @@ DWORD count;
/****************************************************************************
* WCMD_compare
*/
int WCMD_compare( const void *a, const void *b )
static int WCMD_compare( const void *a, const void *b )
{
int r;
const char * const *str_a = a, * const *str_b = b;
@ -773,7 +773,7 @@ int WCMD_compare( const void *a, const void *b )
*
* sort variables into order for display
*/
void WCMD_setshow_sortenv(const char *s)
static void WCMD_setshow_sortenv(const char *s)
{
UINT count=0, len=0, i;
const char **str;

4
programs/wineconsole/curses.c
View File

@ -267,7 +267,7 @@ static void WCCURSES_PosCursor(const struct inner_data* data)
*
* Sets a new shape for the cursor
*/
void WCCURSES_ShapeCursor(struct inner_data* data, int size, int vis, BOOL force)
static void WCCURSES_ShapeCursor(struct inner_data* data, int size, int vis, BOOL force)
{
/* we can't do much about the size... */
data->curcfg.cursor_size = size;
@ -280,7 +280,7 @@ void WCCURSES_ShapeCursor(struct inner_data* data, int size, int vis, BOOL force
*
* Recomputes all the components (mainly scroll bars) positions
*/
void WCCURSES_ComputePositions(struct inner_data* data)
static void WCCURSES_ComputePositions(struct inner_data* data)
{
int x, y;

4
programs/wineconsole/user.c
View File

@ -202,7 +202,7 @@ static void WCUSER_ShapeCursor(struct inner_data* data, int size, int vis, BOOL
*
* Recomputes all the components (mainly scroll bars) positions
*/
void WCUSER_ComputePositions(struct inner_data* data)
static void WCUSER_ComputePositions(struct inner_data* data)
{
RECT r;
int dx, dy;
@ -1299,7 +1299,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
*
*
*/
void WCUSER_DeleteBackend(struct inner_data* data)
static void WCUSER_DeleteBackend(struct inner_data* data)
{
if (!PRIVATE(data)) return;
if (PRIVATE(data)->hMemDC) DeleteDC(PRIVATE(data)->hMemDC);

4
programs/winepath/winepath.c
View File

@ -40,7 +40,7 @@ typedef LPSTR (*wine_get_unix_file_name_t) ( LPCWSTR dos );
/*
* handle an option
*/
int option(int shortopt, char *longopt)
static int option(int shortopt, char *longopt)
{
const char *helpmsg =
"Convert PATH(s) to Unix or Windows long or short paths.\n"
@ -83,7 +83,7 @@ int option(int shortopt, char *longopt)
/*
* Parse command line options
*/
int parse_options(char *argv[])
static int parse_options(char *argv[])
{
int outputformats = 0;
int done = 0;