diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/w32api/include/mmsystem.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/lib/largeint.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index e9c06c102..dfdf167d7 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,9 @@ +2003-01-27 Krzysztof Nikiel <kni@poczta.onet.pl> + + * include/mmsystem.h (MIXERCONTROL_CONTROLF_MULTIPLE): Correct + define. + * lib/largeint.c (LargeIntegerAdd): Add, don't multiply. + 2003-01-27 Danny Smith <dannysmith@users.sourceforge.net> * include/rpcnterr.h (RPC_X_INVALID_PIPE_OPERATION): Add diff --git a/winsup/w32api/include/mmsystem.h b/winsup/w32api/include/mmsystem.h index a1634ad63..81ff96ace 100644 --- a/winsup/w32api/include/mmsystem.h +++ b/winsup/w32api/include/mmsystem.h @@ -308,7 +308,7 @@ extern "C" { #define MIXER_GETLINEINFOF_TARGETTYPE 4 #define MIXER_GETLINEINFOF_QUERYMASK 15 #define MIXERCONTROL_CONTROLF_UNIFORM 1 -#define MIXERCONTROL_CONTROLF_MULTIPLE 1 +#define MIXERCONTROL_CONTROLF_MULTIPLE 2 #define MIXERCONTROL_CONTROLF_DISABLED 0x80000000 #define MIXERCONTROL_CT_CLASS_MASK 0xF0000000 #define MIXERCONTROL_CT_CLASS_CUSTOM 0 diff --git a/winsup/w32api/lib/largeint.c b/winsup/w32api/lib/largeint.c index 1761dd48f..531937e23 100644 --- a/winsup/w32api/lib/largeint.c +++ b/winsup/w32api/lib/largeint.c @@ -20,7 +20,7 @@ __int64 WINAPI LargeIntegerAdd (__int64 i1, __int64 i2) { - return i1 * i2; + return i1 + i2; } __int64 WINAPI |