wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Christian Costa : windowscodecs: Fix init of LONGLONG variable with a negative value in TGA decoder.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: cc95915a3c2a09fa44b7a9bc5424ecb60b060a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc95915a3c2a09fa44b7a9bc5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Jan 15 09:57:18 2015 +0100 windowscodecs: Fix init of LONGLONG variable with a negative value in TGA decoder. --- dlls/windowscodecs/tgaformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index f2a867a..2b8cb1a 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -292,7 +292,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p This->image_offset = This->colormap_offset + This->colormap_length; /* Read footer if there is one */ - seek.QuadPart = -sizeof(tga_footer); + seek.QuadPart = -(LONGLONG)sizeof(tga_footer); hr = IStream_Seek(pIStream, seek, STREAM_SEEK_END, NULL); if (SUCCEEDED(hr)) {

1 0

Sebastian Lackner : winecfg: Add library override instead of closing winecfg when pressing Enter.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 317fc7aaf8dfa5153d4efbb27d0944514b73de0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=317fc7aaf8dfa5153d4efbb27… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 7 08:00:34 2015 +0100 winecfg: Add library override instead of closing winecfg when pressing Enter. Based on a patch by Hugh McMaster. --- programs/winecfg/libraries.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 660737b..a9889e5 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -421,9 +421,15 @@ static void on_add_combo_change(HWND dialog) len=SendDlgItemMessageW(dialog, IDC_DLLCOMBO, CB_GETLBTEXTLEN, sel, 0); if (buffer[0] || len>0) + { enable(IDC_DLLS_ADDDLL) + SendMessageW(GetParent(dialog), DM_SETDEFID, IDC_DLLS_ADDDLL, 0); + } else + { disable(IDC_DLLS_ADDDLL); + SendMessageW(GetParent(dialog), DM_SETDEFID, IDOK, 0); + } } static void set_dllmode(HWND dialog, DWORD id) @@ -492,7 +498,8 @@ static void on_add_click(HWND dialog) SendDlgItemMessageW(dialog, IDC_DLLCOMBO, WM_SETTEXT, 0, (LPARAM)emptyW); disable(IDC_DLLS_ADDDLL); - + SendMessageW(GetParent(dialog), DM_SETDEFID, IDOK, 0); + WINE_TRACE("Adding %s as native, builtin\n", buffer); SendMessageW(GetParent(dialog), PSM_CHANGED, 0, 0); @@ -605,18 +612,18 @@ LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case WM_COMMAND: switch(HIWORD(wParam)) { - - /* FIXME: when the user hits enter in the DLL combo box we should invoke the add - * add button, rather than the propsheet OK button. But I don't know how to do that! - */ - case CBN_EDITCHANGE: - if(LOWORD(wParam) == IDC_DLLCOMBO) - { - on_add_combo_change(hDlg); - break; - } - + if (LOWORD(wParam) == IDC_DLLCOMBO) + on_add_combo_change(hDlg); + break; + case CBN_SETFOCUS: + if (LOWORD(wParam) == IDC_DLLCOMBO) + on_add_combo_change(hDlg); + break; + case CBN_KILLFOCUS: + if (LOWORD(wParam) == IDC_DLLCOMBO) + SendMessageW(GetParent(hDlg), DM_SETDEFID, IDOK, 0); + break; case BN_CLICKED: switch(LOWORD(wParam)) { case IDC_DLLS_ADDDLL:

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 6aa793e269dd8b72944b80630d828df7b3c42fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa793e269dd8b72944b80630… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Mar 3 19:00:21 2015 +0200 po: Update Finnish translation. --- po/fi.po | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/po/fi.po b/po/fi.po index 6c4918a..700a4df 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2717,22 +2717,17 @@ msgid "" "verify messages signed with it.\n" "Are you sure you want to remove this certificate?" msgstr "" -"Jos jatkat, et voi enää salata viestejä tällä varmenteella tai vahvistaa " +"Jos poistat varmenteen, et voi enää salata sillä viestejä etkä vahvistaa " "sillä allekirjoitettujen viestien aitoutta.\n" -"Haluatko varmasti poistaa varmenteen?" +"Haluatko varmasti poistaa tämän varmenteen?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" "Are you sure you want to remove these certificates?" msgstr "" -"Jos jatkat, et voi enää salata viestejä näillä varmenteilla tai vahvistaa " +"Jos poistat varmenteita, et voi enää salata niillä viestejä etkä vahvistaa " "niillä allekirjoitettujen viestien aitoutta.\n" "Haluatko varmasti poistaa nämä varmenteet?" @@ -3138,10 +3133,8 @@ msgid "&View Source" msgstr "Nä&ytä lähde" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Ominaisuudet" +msgstr "&Ominaisuudet" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 @@ -11493,21 +11486,17 @@ msgid "Error: Invalid command line parameters\n" msgstr "Virhe: Viallisia komentoriviparametreja\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Virhe: Etäkoneelle ei voitu lisätä avaimia\n" +msgstr "Virhe: Ei pääsyä etäkoneelle\n" #: reg.rc:38 msgid "" "Error: The system was unable to find the specified registry key or value\n" -msgstr "Virhe: järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" +msgstr "Virhe: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Tyyppiä ei tueta.\n" +msgstr "Virhe: Tyyppiä ei tueta\n" #: regedit.rc:34 msgid "&Registry" @@ -11663,19 +11652,19 @@ msgstr "Muokkaa merkkijonoja" #: regedit.rc:137 msgid "Contains commands for working with the whole registry" -msgstr "Sisältää komentoja koko rekisteriä varten" +msgstr "Sisältää komentoja, joilla voi käsitellä koko rekisteriä" #: regedit.rc:138 msgid "Contains commands for editing values or keys" -msgstr "Sisältää avainten arvojen muokkauskomentoja" +msgstr "Sisältää komentoja, joilla voi muokata avaimia ja arvoja" #: regedit.rc:139 msgid "Contains commands for customizing the registry window" -msgstr "Sisältää rekisteri-ikkunan mukauttamiskomentoja" +msgstr "Sisältää komentoja, joilla voi mukauttaa rekisteri-ikkunaa" #: regedit.rc:140 msgid "Contains commands for accessing frequently used keys" -msgstr "Sisältää komentoja usein käytettyihin avaimiin" +msgstr "Sisältää komentoja, joilla pääsee usein käytettyihin avaimiin" #: regedit.rc:141 msgid ""

1 0

Alexandre Julliard : wininet: Hardcode the base64 table to avoid ugly macros.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 5bf29fb897339a4927cbeac8b5a53d8048e7ceb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf29fb897339a4927cbeac8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 17:07:24 2015 +0900 wininet: Hardcode the base64 table to avoid ugly macros. --- dlls/wininet/http.c | 43 ++++++++++--------------------------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c0785b9..328882e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1555,40 +1555,17 @@ static UINT HTTP_EncodeBase64( LPCSTR bin, unsigned int len, LPWSTR base64 ) return n; } -#define CH(x) (((x) >= 'A' && (x) <= 'Z') ? (x) - 'A' : \ - ((x) >= 'a' && (x) <= 'z') ? (x) - 'a' + 26 : \ - ((x) >= '0' && (x) <= '9') ? (x) - '0' + 52 : \ - ((x) == '+') ? 62 : ((x) == '/') ? 63 : -1) -static const signed char HTTP_Base64Dec[256] = -{ - CH( 0),CH( 1),CH( 2),CH( 3),CH( 4),CH( 5),CH( 6),CH( 7),CH( 8),CH( 9), - CH(10),CH(11),CH(12),CH(13),CH(14),CH(15),CH(16),CH(17),CH(18),CH(19), - CH(20),CH(21),CH(22),CH(23),CH(24),CH(25),CH(26),CH(27),CH(28),CH(29), - CH(30),CH(31),CH(32),CH(33),CH(34),CH(35),CH(36),CH(37),CH(38),CH(39), - CH(40),CH(41),CH(42),CH(43),CH(44),CH(45),CH(46),CH(47),CH(48),CH(49), - CH(50),CH(51),CH(52),CH(53),CH(54),CH(55),CH(56),CH(57),CH(58),CH(59), - CH(60),CH(61),CH(62),CH(63),CH(64),CH(65),CH(66),CH(67),CH(68),CH(69), - CH(70),CH(71),CH(72),CH(73),CH(74),CH(75),CH(76),CH(77),CH(78),CH(79), - CH(80),CH(81),CH(82),CH(83),CH(84),CH(85),CH(86),CH(87),CH(88),CH(89), - CH(90),CH(91),CH(92),CH(93),CH(94),CH(95),CH(96),CH(97),CH(98),CH(99), - CH(100),CH(101),CH(102),CH(103),CH(104),CH(105),CH(106),CH(107),CH(108),CH(109), - CH(110),CH(111),CH(112),CH(113),CH(114),CH(115),CH(116),CH(117),CH(118),CH(119), - CH(120),CH(121),CH(122),CH(123),CH(124),CH(125),CH(126),CH(127),CH(128),CH(129), - CH(130),CH(131),CH(132),CH(133),CH(134),CH(135),CH(136),CH(137),CH(138),CH(139), - CH(140),CH(141),CH(142),CH(143),CH(144),CH(145),CH(146),CH(147),CH(148),CH(149), - CH(150),CH(151),CH(152),CH(153),CH(154),CH(155),CH(156),CH(157),CH(158),CH(159), - CH(160),CH(161),CH(162),CH(163),CH(164),CH(165),CH(166),CH(167),CH(168),CH(169), - CH(170),CH(171),CH(172),CH(173),CH(174),CH(175),CH(176),CH(177),CH(178),CH(179), - CH(180),CH(181),CH(182),CH(183),CH(184),CH(185),CH(186),CH(187),CH(188),CH(189), - CH(190),CH(191),CH(192),CH(193),CH(194),CH(195),CH(196),CH(197),CH(198),CH(199), - CH(200),CH(201),CH(202),CH(203),CH(204),CH(205),CH(206),CH(207),CH(208),CH(209), - CH(210),CH(211),CH(212),CH(213),CH(214),CH(215),CH(216),CH(217),CH(218),CH(219), - CH(220),CH(221),CH(222),CH(223),CH(224),CH(225),CH(226),CH(227),CH(228),CH(229), - CH(230),CH(231),CH(232),CH(233),CH(234),CH(235),CH(236),CH(237),CH(238),CH(239), - CH(240),CH(241),CH(242),CH(243),CH(244),CH(245),CH(246),CH(247),CH(248), CH(249), - CH(250),CH(251),CH(252),CH(253),CH(254),CH(255), +static const signed char HTTP_Base64Dec[] = +{ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00 */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10 */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /* 0x20 */ + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, /* 0x30 */ + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, /* 0x40 */ + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, /* 0x50 */ + -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 0x60 */ + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1 /* 0x70 */ }; -#undef CH /*********************************************************************** * HTTP_DecodeBase64

1 0

Alexandre Julliard : gdi32: Use shorter constants for byte and word masks to avoid warnings.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 336be2f694b669b5c6d6168aa5f8c29d954b2be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=336be2f694b669b5c6d6168aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 15:43:14 2015 +0900 gdi32: Use shorter constants for byte and word masks to avoid warnings. --- dlls/gdi32/dibdrv/primitives.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 1569bc0..c7b48ed 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -6020,7 +6020,7 @@ static void shrink_row_24(const dib_info *dst_dib, const POINT *dst_start, else { struct rop_codes codes; - BYTE init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BYTE init_val = (mode == STRETCH_ANDSCANS) ? 0xff : 0; BOOL new_pix = TRUE; rop_codes_from_stretch_mode( mode, &codes ); @@ -6070,7 +6070,7 @@ static void shrink_row_16(const dib_info *dst_dib, const POINT *dst_start, else { struct rop_codes codes; - WORD init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + WORD init_val = (mode == STRETCH_ANDSCANS) ? 0xffff : 0; BOOL new_pix = TRUE; rop_codes_from_stretch_mode( mode, &codes ); @@ -6118,7 +6118,7 @@ static void shrink_row_8(const dib_info *dst_dib, const POINT *dst_start, else { struct rop_codes codes; - BYTE init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BYTE init_val = (mode == STRETCH_ANDSCANS) ? 0xff : 0; BOOL new_pix = TRUE; rop_codes_from_stretch_mode( mode, &codes ); @@ -6149,7 +6149,7 @@ static void shrink_row_4(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width, dst_x = dst_dib->rect.left + dst_start->x, src_x = src_dib->rect.left + src_start->x; struct rop_codes codes; - BYTE src_val, init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BYTE src_val, init_val = (mode == STRETCH_ANDSCANS) ? 0xff : 0; BOOL new_pix = TRUE; rop_codes_from_stretch_mode( mode, &codes ); @@ -6189,7 +6189,7 @@ static void shrink_row_1(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width, dst_x = dst_dib->rect.left + dst_start->x, src_x = src_dib->rect.left + src_start->x; struct rop_codes codes; - BYTE src_val, init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BYTE src_val, init_val = (mode == STRETCH_ANDSCANS) ? 0xff : 0; BOOL new_pix = TRUE; rop_codes_from_stretch_mode( mode, &codes );

1 0

Alexandre Julliard : scrrun: Fix typo in header guard.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 74b627e89478ee38bd84bd61e880d4b590e4e306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b627e89478ee38bd84bd61e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:25:52 2015 +0900 scrrun: Fix typo in header guard. --- dlls/scrrun/scrrun_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index a149202..43b20a9 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _SCRRUN_PRIVATE_H_ -#define _SCRRUN_PRIVATE_H +#define _SCRRUN_PRIVATE_H_ extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : mmdevapi/tests: Use float constants with fabsf.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 9f59a60968bb444eb7ba202072bb05fa2a5fc5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f59a60968bb444eb7ba20207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 15:41:10 2015 +0900 mmdevapi/tests: Use float constants with fabsf. --- dlls/mmdevapi/tests/capture.c | 8 ++++---- dlls/mmdevapi/tests/render.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 23075ea..702843c 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -948,15 +948,15 @@ static void test_volume_dependence(void) hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.2) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.2f) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IChannelAudioVolume_GetChannelVolume(cav, 0, &vol); ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.4) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); ok(hr == S_OK, "SAV_GetMasterVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.6) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.6f) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); @@ -976,7 +976,7 @@ static void test_volume_dependence(void) hr = IChannelAudioVolume_GetChannelVolume(cav2, 0, &vol); ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.4) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IAudioStreamVolume_GetChannelVolume(asv2, 0, &vol); ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index af296ac..c6b8e90 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1855,15 +1855,15 @@ static void test_volume_dependence(void) hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.2) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.2f) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IChannelAudioVolume_GetChannelVolume(cav, 0, &vol); ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.4) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); ok(hr == S_OK, "SAV_GetMasterVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.6) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.6f) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); @@ -1889,7 +1889,7 @@ static void test_volume_dependence(void) hr = IChannelAudioVolume_GetChannelVolume(cav2, 0, &vol); ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.4) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IAudioStreamVolume_GetChannelVolume(asv2, 0, &vol); ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr);

1 0

Alexandre Julliard : shell32/tests: Use NULL for a null pointer.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: d28052066ddc1a8ea1acda1e7f8284970524360d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28052066ddc1a8ea1acda1e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:31:56 2015 +0900 shell32/tests: Use NULL for a null pointer. --- dlls/shell32/tests/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 07e4ee2..6bb28e1 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2429,7 +2429,7 @@ static void test_unicode(void) shfoW.hwnd = NULL; shfoW.wFunc = FO_DELETE; shfoW.pFrom = UNICODE_PATH; - shfoW.pTo = '\0'; + shfoW.pTo = NULL; shfoW.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; shfoW.hNameMappings = NULL; shfoW.lpszProgressTitle = NULL;

1 0

Alexandre Julliard : oledb32/tests: The destination array address can' t be modified by the called function.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: 65180fb2e89140a6eb315310163800555e43766d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65180fb2e89140a6eb3153101… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:17:53 2015 +0900 oledb32/tests: The destination array address can't be modified by the called function. --- dlls/oledb32/tests/convert.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index b039e11..f7558da 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1346,7 +1346,7 @@ static void test_converttowstr(void) memcpy(src, &IID_IDataConvert, sizeof(GUID)); memset(dst, 0xcc, sizeof(dst)); dst_len = 0x1234; - hr = IDataConvert_DataConvert(convert, DBTYPE_GUID, DBTYPE_WSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + hr = IDataConvert_DataConvert(convert, DBTYPE_GUID, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 76, "got %ld\n", dst_len); @@ -1469,17 +1469,15 @@ static void test_converttowstr(void) b = SysAllocStringLen(NULL, 0); V_VT(&v) = VT_BSTR; V_BSTR(&v) = b; - hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == 0, "got %ld\n", dst_len); - ok(dst != NULL, "got %p\n", dst); - ok(dst != b, "got %p src %p\n", dst, b); ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); VariantClear(&v); V_VT(&v) = VT_NULL; - hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_WSTR, 0, &dst_len, &v, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 0, "got %ld\n", dst_len);

1 0

Alexandre Julliard : msvcrt: Use the correct object type for __non_rtti_object exceptions.
by Alexandre Julliard 04 Mar '15

04 Mar '15

Module: wine Branch: master Commit: b7f6362ddc0fd0bc04b6689a4772e8e39b06fd84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f6362ddc0fd0bc04b6689a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 13:57:29 2015 +0900 msvcrt: Use the correct object type for __non_rtti_object exceptions. --- dlls/msvcrt/cpp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index de9a9b4..8f7fdf2 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -904,7 +904,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY @@ -941,7 +941,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY @@ -1028,7 +1028,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY @@ -1091,7 +1091,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY @@ -1131,7 +1131,7 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj) { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
78
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 March 2015