December 2006 - Wine-Commits

Dmitry Timoshkov : rpcrt4: Make some data const.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 8c3fdfea42dbac50ff3a9f049e1737fcc374ed92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3fdfea42dbac50ff3a9f049… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:47:33 2006 +0800 rpcrt4: Make some data const. --- dlls/rpcrt4/rpc_transport.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4382a8b..f8091da 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -193,7 +193,7 @@ static RPC_STATUS rpcrt4_conn_open_pipe( static RPC_STATUS rpcrt4_ncalrpc_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; - static LPCSTR prefix = "\\\\.\\pipe\\lrpc\\"; + static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; RPC_STATUS r; LPSTR pname; @@ -213,7 +213,7 @@ static RPC_STATUS rpcrt4_ncalrpc_open(Rp static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq, LPSTR endpoint) { - static LPCSTR prefix = "\\\\.\\pipe\\lrpc\\"; + static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; RPC_STATUS r; LPSTR pname; RpcConnection *Connection; @@ -241,7 +241,7 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; - static LPCSTR prefix = "\\\\."; + static const char prefix[] = "\\\\."; RPC_STATUS r; LPSTR pname; @@ -260,7 +260,7 @@ static RPC_STATUS rpcrt4_ncacn_np_open(R static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protseq, LPSTR endpoint) { - static LPCSTR prefix = "\\\\."; + static const char prefix[] = "\\\\."; RPC_STATUS r; LPSTR pname; RpcConnection *Connection; @@ -295,7 +295,7 @@ static RPC_STATUS rpcrt4_ncacn_np_handof { RPC_STATUS status; LPSTR pname; - static LPCSTR prefix = "\\\\."; + static const char prefix[] = "\\\\."; rpcrt4_conn_np_handoff((RpcConnection_np *)old_conn, (RpcConnection_np *)new_conn); @@ -311,7 +311,7 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff { RPC_STATUS status; LPSTR pname; - static LPCSTR prefix = "\\\\.\\pipe\\lrpc\\"; + static const char prefix[] = "\\\\.\\pipe\\lrpc\\"; TRACE("%s\n", old_conn->Endpoint);

1 0

Dmitry Timoshkov : msvcrt: Make some data const.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: ffa84441c8ce7a172bc23b8b787e10b8350f1032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa84441c8ce7a172bc23b8b7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:47:24 2006 +0800 msvcrt: Make some data const. --- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/locale.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 34e97e4..fecbf10 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -33,7 +33,7 @@ static MSVCRT__onexit_t *MSVCRT_atexit_t static int MSVCRT_atexit_table_size = 0; static int MSVCRT_atexit_registered = 0; /* Points to free slot */ -static LPCSTR szMsgBoxTitle = "Wine C++ Runtime Library"; +static const char szMsgBoxTitle[] = "Wine C++ Runtime Library"; extern int MSVCRT_app_type; extern char *MSVCRT__pgmptr; diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 32d73d0..aea5488 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -65,7 +65,7 @@ extern unsigned char MSVCRT_mbctype[257] /* Friendly country strings & iso codes for synonym support. * Based on MS documentation for setlocale(). */ -static const char* _country_synonyms[] = +static const char * const _country_synonyms[] = { "Hong Kong","HK", "Hong-Kong","HK", @@ -484,7 +484,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale */ const char* CDECL _Getdays(void) { - static const char *MSVCRT_days = ":Sun:Sunday:Mon:Monday:Tue:Tuesday:Wed:" + static const char MSVCRT_days[] = ":Sun:Sunday:Mon:Monday:Tue:Tuesday:Wed:" "Wednesday:Thu:Thursday:Fri:Friday:Sat:Saturday"; /* FIXME: Use locale */ TRACE("(void) semi-stub\n"); @@ -496,7 +496,7 @@ const char* CDECL _Getdays(void) */ const char* CDECL _Getmonths(void) { - static const char *MSVCRT_months = ":Jan:January:Feb:February:Mar:March:Apr:" + static const char MSVCRT_months[] = ":Jan:January:Feb:February:Mar:March:Apr:" "April:May:May:Jun:June:Jul:July:Aug:August:Sep:September:Oct:" "October:Nov:November:Dec:December"; /* FIXME: Use locale */

1 0

Dmitry Timoshkov : dswave: Make some data const.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 54aae9883810d75bf72a54e1d3639d893d3c001e URL: http://source.winehq.org/git/wine.git/?a=commit;h=54aae9883810d75bf72a54e1d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:47:14 2006 +0800 dswave: Make some data const. --- dlls/dswave/dswave_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 37f9e4c..d919de8 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -69,7 +69,7 @@ static HRESULT WINAPI WaveCF_LockServer( return S_OK; } -static IClassFactoryVtbl WaveCF_Vtbl = { +static const IClassFactoryVtbl WaveCF_Vtbl = { WaveCF_QueryInterface, WaveCF_AddRef, WaveCF_Release,

1 0

Dmitry Timoshkov : crypt32: Make some data const.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 8330bd6c26f3a46feb8a521747d834e9b8c9796a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8330bd6c26f3a46feb8a52174… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:46:40 2006 +0800 crypt32: Make some data const. --- dlls/crypt32/store.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index fab7b78..8c8cda5 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1057,7 +1057,7 @@ static void CRYPT_RegReadSerializedFromR static void CRYPT_RegReadFromReg(PWINE_REGSTOREINFO store) { - static const WCHAR *subKeys[] = { CertsW, CRLsW, CTLsW }; + static const WCHAR * const subKeys[] = { CertsW, CRLsW, CTLsW }; static const DWORD contextFlags[] = { CERT_STORE_CERTIFICATE_CONTEXT_FLAG, CERT_STORE_CRL_CONTEXT_FLAG, CERT_STORE_CTL_CONTEXT_FLAG }; DWORD i; @@ -1146,8 +1146,8 @@ static BOOL CRYPT_SerializeContextsToReg static BOOL CRYPT_RegWriteToReg(PWINE_REGSTOREINFO store) { - static const WCHAR *subKeys[] = { CertsW, CRLsW, CTLsW }; - static const WINE_CONTEXT_INTERFACE *interfaces[] = { &gCertInterface, + static const WCHAR * const subKeys[] = { CertsW, CRLsW, CTLsW }; + static const WINE_CONTEXT_INTERFACE * const interfaces[] = { &gCertInterface, &gCRLInterface, &gCTLInterface }; struct list *listToDelete[] = { &store->certsToDelete, &store->crlsToDelete, NULL };

1 0

Dmitry Timoshkov : dplayx: Make some data const.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: b99e60e29f278472c512fd2d96fea87181809dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b99e60e29f278472c512fd2d9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:47:05 2006 +0800 dplayx: Make some data const. --- dlls/dplayx/dplayx_global.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 9963361..99e0d8e 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -51,10 +51,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* FIXME: Need to do all that fun other dll referencing type of stuff */ /* Static data for all processes */ -static LPCSTR lpszDplayxSemaName = "WINE_DPLAYX_SM"; +static const char lpszDplayxSemaName[] = "WINE_DPLAYX_SM"; static HANDLE hDplayxSema; -static LPCSTR lpszDplayxFileMapping = "WINE_DPLAYX_FM"; +static const char lpszDplayxFileMapping[] = "WINE_DPLAYX_FM"; static HANDLE hDplayxSharedMem; static LPVOID lpSharedStaticData = NULL;

1 0

Dmitry Timoshkov : winearts: Make some data const.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 0b988c73c92583b0fc35cb64b095c9cae762614b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b988c73c92583b0fc35cb64b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:46:23 2006 +0800 winearts: Make some data const. --- dlls/winmm/winearts/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winearts/audio.c b/dlls/winmm/winearts/audio.c index fc7ff80..3e11a97 100644 --- a/dlls/winmm/winearts/audio.c +++ b/dlls/winmm/winearts/audio.c @@ -210,7 +210,7 @@ static DWORD wodDsCreate(UINT wDevID, PI static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc); /* These strings used only for tracing */ -static const char *wodPlayerCmdString[] = { +static const char * const wodPlayerCmdString[] = { "WINE_WM_PAUSING", "WINE_WM_RESTARTING", "WINE_WM_RESETTING",

1 0

Dmitry Timoshkov : dbghelp: Make some data const.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: e7d620081f6020b3495b2a92477c12f62464403b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d620081f6020b3495b2a924… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:46:48 2006 +0800 dbghelp: Make some data const. --- dlls/dbghelp/module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index a58ee6f..ce1cc07 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -34,11 +34,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static const char* ext[] = {".acm", ".dll", ".drv", ".exe", ".ocx", ".vxd", NULL}; +static const char * const ext[] = {".acm", ".dll", ".drv", ".exe", ".ocx", ".vxd", NULL}; static int match_ext(const char* ptr, size_t len) { - const char**e; + const char * const *e; size_t l; for (e = ext; *e; e++)

1 0

Dmitry Timoshkov : atl: Make some data const.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 0be2a967dce9fa0f99d504aadede25cc72fe7cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be2a967dce9fa0f99d504aad… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:46:31 2006 +0800 atl: Make some data const. --- dlls/atl/registrar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 2869e49..612ebda 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -44,7 +44,7 @@ static LONG dll_count; * ATLRegistrar implementation */ -static struct { +static const struct { WCHAR name[22]; HKEY key; } root_keys[] = {

1 0

Dmitry Timoshkov : wineoss: Make some data const.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: b05173486a12adaaa14d206da4c8f8aa3c9871c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05173486a12adaaa14d206da… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 14 22:46:12 2006 +0800 wineoss: Make some data const. --- dlls/winmm/wineoss/midi.c | 4 ++-- dlls/winmm/wineoss/midipatch.c | 6 ++---- dlls/winmm/wineoss/mixer.c | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index 6b9cdf8..ffa7d86 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -1000,8 +1000,8 @@ typedef struct sFMextra { */ } sFMextra; -extern unsigned char midiFMInstrumentPatches[16 * 128]; -extern unsigned char midiFMDrumsPatches [16 * 128]; +extern const unsigned char midiFMInstrumentPatches[16 * 128]; +extern const unsigned char midiFMDrumsPatches [16 * 128]; /************************************************************************** * modFMLoad [internal] diff --git a/dlls/winmm/wineoss/midipatch.c b/dlls/winmm/wineoss/midipatch.c index e991e04..1180c6f 100644 --- a/dlls/winmm/wineoss/midipatch.c +++ b/dlls/winmm/wineoss/midipatch.c @@ -26,7 +26,7 @@ #define NOT_DEFINED 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -unsigned char midiFMInstrumentPatches[128 * 16] = { +const unsigned char midiFMInstrumentPatches[128 * 16] = { /* 0 Acoustic Grand Piano */ 0x21, 0x11, 0x4c, 0x00, 0xf1, 0xf2, 0x63, 0x72, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, /* 1 Bright Acoustic Piano */ 0x01, 0x11, 0x4f, 0x00, 0xf1, 0xd2, 0x53, 0x74, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, /* 2 Electric Grand Piano */ 0x01, 0x01, 0x4f, 0x04, 0xf1, 0xd2, 0x50, 0x7c, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -157,7 +157,7 @@ unsigned char midiFMInstrumentPatches[12 /* 127 Gunshot */ 0x0c, 0x50, 0x00, 0x21, 0xf8, 0x09, 0xb6, 0x04, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, }; -unsigned char midiFMDrumsPatches[16 * 128] = { +const unsigned char midiFMDrumsPatches[16 * 128] = { /* 1 Not defined */ NOT_DEFINED /* 2 Not defined */ NOT_DEFINED /* 3 Not defined */ NOT_DEFINED @@ -287,5 +287,3 @@ unsigned char midiFMDrumsPatches[16 * 12 /* 127 Not defined */ NOT_DEFINED /* 128 Not defined */ NOT_DEFINED }; - - diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c index bce0628..a28305b 100644 --- a/dlls/winmm/wineoss/mixer.c +++ b/dlls/winmm/wineoss/mixer.c @@ -79,8 +79,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mixer); /* FIXME: the two following string arrays should be moved to a resource file in a string table */ /* if it's done, better use a struct to hold labels, name, and muted channel volume cache */ -static const char* MIX_Labels[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS; -static const char* MIX_Names [SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_NAMES; +static const char * const MIX_Labels[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS; +static const char * const MIX_Names [SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_NAMES; struct mixerCtrl {

1 0

Paul Vriens : kernel32/tests: Be a bit more verbose on failure.
by Alexandre Julliard Dec. 14, 2006

Dec. 14, 2006

Module: wine Branch: master Commit: 96bc4517c37f263d76297a73f1a7d9e80f83ee6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96bc4517c37f263d76297a73f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Dec 14 14:29:45 2006 +0100 kernel32/tests: Be a bit more verbose on failure. --- dlls/kernel32/tests/process.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d40ea26..0755761 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -710,6 +710,7 @@ static void test_CommandLine(void) PROCESS_INFORMATION info; STARTUPINFOA startup; DWORD len; + BOOL ret; memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -758,7 +759,9 @@ static void test_CommandLine(void) /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0]*/ get_file_name(resfile); sprintf(buffer, "./%s tests/process.c %s \"a\\\"b\\\\\" c\\\" d", selfname, resfile); - ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ @@ -770,7 +773,9 @@ static void test_CommandLine(void) get_file_name(resfile); sprintf(buffer, ".\\%s tests/process.c %s \"a\\\"b\\\\\" c\\\" d", selfname, resfile); - ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ @@ -787,7 +792,9 @@ static void test_CommandLine(void) p = strrchr(fullpath, '\\'); assert (p); sprintf(buffer, "..%s/%s tests/process.c %s \"a\\\"b\\\\\" c\\\" d", p, selfname, resfile); - ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */

1 0