wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Trey Hunner : cmd: Add support for 'if /i'.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: afb374b7aa3f16b4e0de574314bef11b597a4363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb374b7aa3f16b4e0de57431… Author: Trey Hunner <treyhunner(a)gmail.com> Date: Tue Feb 2 01:09:06 2010 -0800 cmd: Add support for 'if /i'. --- programs/cmd/builtins.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2c2761d..c63360b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1277,6 +1277,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { static const WCHAR existW[] = {'e','x','i','s','t','\0'}; static const WCHAR defdW[] = {'d','e','f','i','n','e','d','\0'}; static const WCHAR eqeqW[] = {'=','=','\0'}; + static const WCHAR parmI[] = {'/','I','\0'}; if (!lstrcmpiW (param1, notW)) { negate = 1; @@ -1305,7 +1306,12 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { } else if ((s = strstrW (p, eqeqW))) { s += 2; - if (!lstrcmpiW (condition, WCMD_parameter (s, 0, NULL))) test = 1; + if (strstrW (quals, parmI) == NULL) { + if (!lstrcmpW (condition, WCMD_parameter (s, 0, NULL))) test = 1; + } + else { + if (!lstrcmpiW (condition, WCMD_parameter (s, 0, NULL))) test = 1; + } WCMD_parameter (s, 1, &command); } else {

1 0

André Hentschel : oleaut32: Rewrite RollUdate to be easier to change and to support more conversions.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 1b51c21fb30ee3fa4366d3628d343361e1696ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b51c21fb30ee3fa4366d3628… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 1 21:26:44 2010 +0100 oleaut32: Rewrite RollUdate to be easier to change and to support more conversions. --- dlls/oleaut32/tests/vartest.c | 30 ++++++++++----- dlls/oleaut32/variant.c | 81 +++++++++++++++++++++++++++-------------- 2 files changed, 74 insertions(+), 37 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 8d7cf11..377a847 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1639,26 +1639,36 @@ static void test_VarDateFromUdate(void) CHECKPTR(VarDateFromUdate); UD2T(1,1,1980,0,0,0,0,2,1,0,S_OK,29221.0); /* 1 Jan 1980 */ UD2T(2,1,1980,0,0,0,0,3,2,0,S_OK,29222.0); /* 2 Jan 1980 */ + UD2T(2,1,1980,0,0,0,0,4,5,0,S_OK,29222.0); /* 2 Jan 1980 */ UD2T(31,12,1990,0,0,0,0,0,0,0,S_OK,33238.0); /* 31 Dec 1990 */ UD2T(31,12,90,0,0,0,0,0,0,0,S_OK,33238.0); /* year < 100 is 1900+year! */ UD2T(30,12,1899,0,0,0,0,6,364,0,S_OK,0.0); /* 30 Dec 1899 - VT_DATE 0.0 */ UD2T(1,1,100,0,0,0,0,0,0,0,S_OK,-657434.0); /* 1 Jan 100 - Min */ UD2T(31,12,9999,0,0,0,0,0,0,0,S_OK,2958465.0); /* 31 Dec 9999 - Max */ UD2T(1,1,10000,0,0,0,0,0,0,0,E_INVALIDARG,0.0); /* > 31 Dec 9999 => err */ + UD2T(1,1,-10000,0,0,0,0,0,0,0,E_INVALIDARG,0.0);/* < -9999 => err */ UD2T(30,12,1899,0,0,0,0,0,0,0,S_OK,0.0); /* 30 Dec 1899 0:00:00 */ UD2T(30,12,1899,0,0,0,999,0,0,0,S_OK,0.0); /* Ignore milliseconds */ - UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */ - todo_wine UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled hours */ - todo_wine UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled minutes */ - todo_wine UD2T(1,1,1980,18,0,76,0,2,1,0,S_OK,29221.75087962963); /* Test rolled seconds */ - todo_wine UD2T(2,1,1980,-6,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled hours */ - todo_wine UD2T(1,1,1980,19,-59,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled minutes */ - todo_wine UD2T(1,1,1980,18,2,-44,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled seconds */ - - UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Rolls back to 31 Dec 1899 */ - UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */ + UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */ + UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled hours */ + UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled minutes */ + UD2T(1,1,1980,18,0,76,0,2,1,0,S_OK,29221.75087962963); /* Test fwdrolled seconds */ + UD2T(3,1,1980,-30,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled hours */ + UD2T(1,1,1980,20,-119,16,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled minutes */ + UD2T(1,1,1980,18,3,-104,0,2,1,0,S_OK,29221.75087962963); /* Test backrolled seconds */ + UD2T(1,12001,-1020,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test rolled year and month */ + UD2T(1,-23,1982,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled month */ + todo_wine UD2T(-59,3,1980,18,1,16,0,0,0,0,S_OK,29221.75087962963); /* Test backrolled days */ + todo_wine UD2T(1,1,0,0,0,0,0,0,0,0,S_OK,36526); /* Test zero year */ + + UD2T(0,0,1980,0,0,0,0,0,0,0,S_OK,29189); /* Test zero day and month */ + UD2T(0,1,1980,0,0,0,0,2,1,0,S_OK,29220.0); /* Test zero day = LastDayOfMonth */ + UD2T(-1,1,1980,18,1,16,0,0,0,0,S_OK,29219.75087962963); /* Test day -1 = LastDayOfMonth - 1 */ + UD2T(1,1,-1,18,1,16,0,0,0,0,S_OK,36161.75087962963); /* Test year -1 = 1999 */ + UD2T(1,-1,1980,18,1,16,0,0,0,0,S_OK,29160.7508796296); /* Test month -1 = 11 */ + UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */ } static void test_st2dt(int line, WORD d, WORD m, WORD y, WORD h, WORD mn, diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 56ab2b3..dabe746 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1129,30 +1129,47 @@ static inline double VARIANT_JulianFromDMY(USHORT year, USHORT month, USHORT day static HRESULT VARIANT_RollUdate(UDATE *lpUd) { static const BYTE days[] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + short iYear, iMonth, iDay, iHour, iMinute, iSecond; - TRACE("Raw date: %d/%d/%d %d:%d:%d\n", lpUd->st.wDay, lpUd->st.wMonth, - lpUd->st.wYear, lpUd->st.wHour, lpUd->st.wMinute, lpUd->st.wSecond); + /* interpret values signed */ + iYear = lpUd->st.wYear; + iMonth = lpUd->st.wMonth; + iDay = lpUd->st.wDay; + iHour = lpUd->st.wHour; + iMinute = lpUd->st.wMinute; + iSecond = lpUd->st.wSecond; - /* Years < 100 are treated as 1900 + year */ - if (lpUd->st.wYear < 100) - lpUd->st.wYear += 1900; + TRACE("Raw date: %d/%d/%d %d:%d:%d\n", iDay, iMonth, + iYear, iHour, iMinute, iSecond); - if (!lpUd->st.wMonth) - { - /* Roll back to December of the previous year */ - lpUd->st.wMonth = 12; - lpUd->st.wYear--; - } - else while (lpUd->st.wMonth > 12) + if (iYear > 9999 || iYear < -9999) + return E_INVALIDARG; /* Invalid value */ + /* Years < 100 are treated as 1900 + year */ + if (iYear >= 0 && iYear < 100) + iYear += 1900; + + iMinute += (iSecond - (iSecond % 60)) / 60; + iSecond = iSecond % 60; + iHour += (iMinute - (iMinute % 60)) / 60; + iMinute = iMinute % 60; + iDay += (iHour - (iHour % 24)) / 24; + iHour = iHour % 24; + /* FIXME: Roll Days */ + iYear += (iMonth - (iMonth % 12)) / 12; + iMonth = iMonth % 12; + + if (iSecond<0){iSecond+=60; iMinute--;} + if (iMinute<0){iMinute+=60; iHour--;} + if (iHour<0) {iHour+=24; iDay--;} + if (iDay<0) { - /* Roll forward the correct number of months */ - lpUd->st.wYear++; - lpUd->st.wMonth -= 12; + iDay+=days[iMonth]; + iMonth--; + if (iMonth == 2 && IsLeapYear(iYear)) + iDay++; } - - if (lpUd->st.wYear > 9999 || lpUd->st.wHour > 23 || - lpUd->st.wMinute > 59 || lpUd->st.wSecond > 59) - return E_INVALIDARG; /* Invalid values */ + if (iMonth<=0) {iMonth+=12; iYear--;} + if (iYear<0) iYear+=2000; if (!lpUd->st.wDay) { @@ -1178,22 +1195,30 @@ static HRESULT VARIANT_RollUdate(UDATE *lpUd) int rollForward = 0; /* Possibly need to roll the date forward */ - if (lpUd->st.wMonth == 2 && IsLeapYear(lpUd->st.wYear)) - rollForward = lpUd->st.wDay - 29; /* February has 29 days on leap years */ + if (iMonth == 2 && IsLeapYear(iYear)) + rollForward = iDay - 29; /* February has 29 days on leap years */ else - rollForward = lpUd->st.wDay - days[lpUd->st.wMonth]; + rollForward = iDay - days[iMonth]; if (rollForward > 0) { - lpUd->st.wDay = rollForward; - lpUd->st.wMonth++; - if (lpUd->st.wMonth > 12) + iDay = rollForward; + iMonth++; + if (iMonth > 12) { - lpUd->st.wMonth = 1; /* Roll forward into January of the next year */ - lpUd->st.wYear++; + iMonth = 1; /* Roll forward into January of the next year */ + iYear++; } } } + + lpUd->st.wYear = iYear; + lpUd->st.wMonth = iMonth; + lpUd->st.wDay = iDay; + lpUd->st.wHour = iHour; + lpUd->st.wMinute = iMinute; + lpUd->st.wSecond = iSecond; + TRACE("Rolled date: %d/%d/%d %d:%d:%d\n", lpUd->st.wDay, lpUd->st.wMonth, lpUd->st.wYear, lpUd->st.wHour, lpUd->st.wMinute, lpUd->st.wSecond); return S_OK; @@ -1250,6 +1275,8 @@ INT WINAPI DosDateTimeToVariantTime(USHORT wDosDate, USHORT wDosTime, ud.st.wMinute = DOS_MINUTE(wDosTime); ud.st.wSecond = DOS_SECOND(wDosTime); ud.st.wDayOfWeek = ud.st.wMilliseconds = 0; + if (ud.st.wHour > 23 || ud.st.wMinute > 59 || ud.st.wSecond > 59) + return FALSE; /* Invalid values in Dos*/ return VarDateFromUdate(&ud, 0, pDateOut) == S_OK; }

1 0

Alexandre Julliard : user32/tests: Dispatch a message in case we can a WM_PAINT.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: c4568edd64a321adf33cfac9ce1ce33f4fe9b049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4568edd64a321adf33cfac9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 2 11:24:46 2010 +0100 user32/tests: Dispatch a message in case we can a WM_PAINT. --- dlls/user32/tests/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6fb6ce0..c92b3ed 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2980,6 +2980,7 @@ static void test_mouse_input(HWND hwnd) if (msg.message == WM_TIMER || ignore_message(msg.message)) continue; ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); + DispatchMessage(&msg); } ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message);

1 0

Jörg Höhle : winecoreaudio: Fix a float cast in the computation of MIDI volume.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: ffeef37be214da8ae07262882c624fa925877929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffeef37be214da8ae07262882… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 27 19:03:47 2010 +0100 winecoreaudio: Fix a float cast in the computation of MIDI volume. --- dlls/winecoreaudio.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6d988db..a31a076 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -546,7 +546,7 @@ static DWORD MIDIOut_GetVolume(WORD wDevID, DWORD *lpdwVolume) float right; AudioUnit_GetVolume(destinations[wDevID].synth, &left, &right); - *lpdwVolume = ((WORD) left * 0xFFFFl) + (((WORD) right * 0xFFFFl) << 16); + *lpdwVolume = (WORD) (left * 0xFFFF) + ((WORD) (right * 0xFFFF) << 16); return MMSYSERR_NOERROR; }

1 0

Frédéric Delanoy : wordpad: Update French translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: f6aaddbd3bcd94731b91ed2762b590fd55d91635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6aaddbd3bcd94731b91ed276… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Feb 1 23:39:27 2010 +0100 wordpad: Update French translation. --- programs/wordpad/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 7831974..376d605 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -221,8 +221,8 @@ BEGIN STRING_PREVIEW_PREVPAGE, "Page précédente" STRING_PREVIEW_TWOPAGES, "Deux pages" STRING_PREVIEW_ONEPAGE, "Une page" - STRING_PREVIEW_ZOOMIN, "Zoom in" - STRING_PREVIEW_ZOOMOUT, "Zoom out" + STRING_PREVIEW_ZOOMIN, "Zoom avant" + STRING_PREVIEW_ZOOMOUT, "Zoom arrière" STRING_PREVIEW_CLOSE, "Fermer" END

1 0

Frédéric Delanoy : wordpad: Fix typo in keyboard shortcut.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 51a6153672576ddd7b6d889172f7088bec088644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a6153672576ddd7b6d88917… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Feb 1 23:34:47 2010 +0100 wordpad: Fix typo in keyboard shortcut. --- programs/wordpad/Da.rc | 2 +- programs/wordpad/En.rc | 2 +- programs/wordpad/Fr.rc | 2 +- programs/wordpad/Hu.rc | 2 +- programs/wordpad/It.rc | 2 +- programs/wordpad/Ja.rc | 2 +- programs/wordpad/Ko.rc | 2 +- programs/wordpad/Lt.rc | 2 +- programs/wordpad/Nl.rc | 2 +- programs/wordpad/No.rc | 2 +- programs/wordpad/Pl.rc | 2 +- programs/wordpad/Pt.rc | 2 +- programs/wordpad/Ru.rc | 2 +- programs/wordpad/Si.rc | 2 +- programs/wordpad/Sv.rc | 2 +- programs/wordpad/Tr.rc | 2 +- programs/wordpad/Uk.rc | 2 +- programs/wordpad/Zh.rc | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51a6153672576ddd7b6d8…

1 0

Michael Stefaniuc : dinput: Don' t use HIWORD to check if a REFGUID is a DIPROP.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 2004db1bb1b7aca9259a756449c3ddf3872426a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2004db1bb1b7aca9259a75644… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 2 00:11:49 2010 +0100 dinput: Don't use HIWORD to check if a REFGUID is a DIPROP. --- dlls/dinput/device.c | 4 ++-- dlls/dinput/dinput_private.h | 2 ++ dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c0f15ff..a5c61ab 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -872,7 +872,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { @@ -906,7 +906,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index ddb9aa0..16b4559 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -65,4 +65,6 @@ typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _dump_diactionformatA(LPDIACTIONFORMATA); +#define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) + #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */ diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 84e45c9..0f39a6d 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -53,7 +53,7 @@ HRESULT WINAPI JoystickAGenericImpl_SetProperty( if (TRACE_ON(dinput)) _dump_DIPROPHEADER(ph); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR)DIPROP_RANGE: { LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; @@ -230,7 +230,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetProperty( if (TRACE_ON(dinput)) _dump_DIPROPHEADER(pdiph); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR) DIPROP_RANGE: { LPDIPROPRANGE pr = (LPDIPROPRANGE)pdiph; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6c3c8cc..6da6066 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -847,7 +847,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("ph.dwSize = %d, ph.dwHeaderSize =%d, ph.dwObj = %d, ph.dwHow= %d\n", ph->dwSize, ph->dwHeaderSize, ph->dwObj, ph->dwHow); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; @@ -898,7 +898,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { case (DWORD_PTR) DIPROP_AUTOCENTER: diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 3692878..4f6aac5 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -447,7 +447,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 4809c56..e05d9e2 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -587,7 +587,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR) DIPROP_GRANULARITY: { LPDIPROPDWORD pr = (LPDIPROPDWORD) pdiph;

1 0

Detlef Riekenberg : mapi32/tests: Fix a typo in a comment.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: e9776726618a5363c6395401e1388c30c5e449e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9776726618a5363c6395401e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 1 20:47:31 2010 +0100 mapi32/tests: Fix a typo in a comment. --- dlls/mapi32/tests/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index 0d1022a..0edac07 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -242,7 +242,7 @@ START_TEST(util) /* We call MAPIInitialize here for the benefit of native extended MAPI * providers which crash in the HexFromBin tests when MAPIInitialize has - * not been called. Since MAPIInitialize is irrelevant for HexFfromBin on + * not been called. Since MAPIInitialize is irrelevant for HexFromBin on * Wine, we do not care whether MAPIInitialize succeeds. */ if (pMAPIInitialize) ret = pMAPIInitialize(NULL);

1 0

Dan Kegel : ntdll: Fix large block realloc annotation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 20430f6edefe0f299fe27303ec9e153873023ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20430f6edefe0f299fe27303e… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Feb 1 11:25:35 2010 -0800 ntdll: Fix large block realloc annotation. --- dlls/ntdll/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4c73184..b440b61 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -767,6 +767,7 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz } memcpy( new_ptr, ptr, arena->data_size ); free_large_block( heap, flags, ptr ); + notify_free( ptr ); return new_ptr; } @@ -1811,7 +1812,6 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size if (!subheap) { if (!(ret = realloc_large_block( heapPtr, flags, ptr, size ))) goto oom; - notify_free( ptr ); goto done; }

1 0

Maarten Lankhorst : userenv: Implement DestroyEnvironmentBlock.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 83486aaf668a7319c1a0c740c1c6ea67b737dc96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83486aaf668a7319c1a0c740c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Feb 1 10:35:37 2010 +0100 userenv: Implement DestroyEnvironmentBlock. --- dlls/userenv/userenv.spec | 2 +- dlls/userenv/userenv_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 26475e5..8b0b749 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -1,5 +1,5 @@ @ stdcall CreateEnvironmentBlock(ptr ptr long) -@ stub DestroyEnvironmentBlock +@ stdcall DestroyEnvironmentBlock(ptr) @ stdcall ExpandEnvironmentStringsForUserA(ptr str ptr long) @ stdcall ExpandEnvironmentStringsForUserW(ptr wstr ptr long) @ stdcall GetAllUsersProfileDirectoryA(ptr ptr) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 8782c94..38fb64c 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -65,6 +65,17 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, return FALSE; } +BOOL WINAPI DestroyEnvironmentBlock(LPVOID lpEnvironment) +{ + NTSTATUS r; + + TRACE("%p\n", lpEnvironment); + r = RtlDestroyEnvironment(lpEnvironment); + if (r == STATUS_SUCCESS) + return TRUE; + return FALSE; +} + BOOL WINAPI ExpandEnvironmentStringsForUserA( HANDLE hToken, LPCSTR lpSrc, LPSTR lpDest, DWORD dwSize ) {

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010