diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-02 09:00:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-02 09:00:03 (GMT) |
| commit | d5de5123cc110d58545db35bad89558c1b224c56 (patch) | |
| tree | 9a3ce836c69169895503a221f8a48f83f3267f48 /win | |
| parent | f0d60d9cdf24270b89652e5a06046714bf01b6ba (diff) | |
| parent | adbd7d18869a4d99a25188fad9c3bbf55d072980 (diff) | |
| download | tcl-d5de5123cc110d58545db35bad89558c1b224c56.zip tcl-d5de5123cc110d58545db35bad89558c1b224c56.tar.gz tcl-d5de5123cc110d58545db35bad89558c1b224c56.tar.bz2 | |
Merge 8.7. Some formatting.
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinDde.c | 10 | ||||
| -rw-r--r-- | win/tclWinReg.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/win/tclWinDde.c b/win/tclWinDde.c index e611f5f..7ce2d7c 100644 --- a/win/tclWinDde.c +++ b/win/tclWinDde.c @@ -36,7 +36,7 @@ typedef struct RegisteredInterp { struct RegisteredInterp *nextPtr; /* The next interp this application knows * about. */ - WCHAR *name; /* Interpreter's name (malloc-ed). */ + WCHAR *name; /* Interpreter's name (malloc-ed). */ Tcl_Obj *handlerPtr; /* The server handler command */ Tcl_Interp *interp; /* The interpreter attached to this name. */ } RegisteredInterp; @@ -1486,7 +1486,7 @@ DdeObjCmd( if (length == 0) { serviceName = NULL; } else if ((index != DDE_SERVERNAME) && (index != DDE_EVAL)) { - ddeService = DdeCreateStringHandle(ddeInstance, (void *) serviceName, + ddeService = DdeCreateStringHandle(ddeInstance, serviceName, CP_WINUNICODE); } @@ -1500,7 +1500,7 @@ DdeObjCmd( if (length == 0) { topicName = NULL; } else { - ddeTopic = DdeCreateStringHandle(ddeInstance, (void *) topicName, + ddeTopic = DdeCreateStringHandle(ddeInstance, topicName, CP_WINUNICODE); } } @@ -1610,7 +1610,7 @@ DdeObjCmd( result = TCL_ERROR; } else { Tcl_Obj *returnObjPtr; - ddeItem = DdeCreateStringHandle(ddeInstance, (void *) itemString, + ddeItem = DdeCreateStringHandle(ddeInstance, itemString, CP_WINUNICODE); if (ddeItem != NULL) { ddeData = DdeClientTransaction(NULL, 0, hConv, ddeItem, @@ -1690,7 +1690,7 @@ DdeObjCmd( SetDdeError(interp); result = TCL_ERROR; } else { - ddeItem = DdeCreateStringHandle(ddeInstance, (void *) itemString, + ddeItem = DdeCreateStringHandle(ddeInstance, itemString, CP_WINUNICODE); if (ddeItem != NULL) { ddeData = DdeClientTransaction(dataString, (DWORD) length, diff --git a/win/tclWinReg.c b/win/tclWinReg.c index aa7d0b9..2cae283 100644 --- a/win/tclWinReg.c +++ b/win/tclWinReg.c @@ -1178,7 +1178,7 @@ RecursiveDeleteKey( HKEY hKey; REGSAM saveMode = mode; static int checkExProc = 0; - static FARPROC regDeleteKeyExProc = NULL; + static LSTATUS (* regDeleteKeyExProc) (HKEY, LPCWSTR, REGSAM, DWORD) = (LSTATUS (*) (HKEY, LPCWSTR, REGSAM, DWORD)) NULL; /* * Do not allow NULL or empty key name. @@ -1218,7 +1218,7 @@ RecursiveDeleteKey( checkExProc = 1; handle = GetModuleHandle(TEXT("ADVAPI32")); - regDeleteKeyExProc = (FARPROC) + regDeleteKeyExProc = (LSTATUS (*) (HKEY, LPCWSTR, REGSAM, DWORD)) GetProcAddress(handle, "RegDeleteKeyExW"); } if (mode && regDeleteKeyExProc) { |