winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2010
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
615 discussions
Start a n
N
ew thread
Paul Vriens : rasapi32/tests: Fix some test failures on Win9x.
by Alexandre Julliard
19 Jan '10
19 Jan '10
Module: wine Branch: master Commit: c5112d9f6f75d0160645829c466cb83ae1786b12 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c5112d9f6f75d0160645829c4…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 19 16:44:22 2010 +0100 rasapi32/tests: Fix some test failures on Win9x. --- dlls/rasapi32/tests/rasapi.c | 3 ++- include/raserror.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index 1bc684c..d25c741 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -55,7 +55,8 @@ static void test_rasenum(void) /* create the return buffer */ result = pRasEnumDevicesA(NULL, &bufsize, &cDevices); - if(ERROR_RASMAN_CANNOT_INITIALIZE == result) { + if(ERROR_RASMAN_CANNOT_INITIALIZE == result || + ERROR_STATE_MACHINES_NOT_STARTED == result) { win_skip("RAS configuration problem\n"); return; } diff --git a/include/raserror.h b/include/raserror.h index 694dfe9..1735936 100644 --- a/include/raserror.h +++ b/include/raserror.h @@ -23,6 +23,7 @@ #define ERROR_BUFFER_TOO_SMALL (RASBASE+3) #define ERROR_BUFFER_INVALID (RASBASE+10) #define ERROR_INVALID_SIZE (RASBASE+32) +#define ERROR_STATE_MACHINES_NOT_STARTED (RASBASE+95) #define ERROR_RASMAN_CANNOT_INITIALIZE (RASBASE+111) #endif
1
0
0
0
Paul Vriens : shell32/tests: Fix crash on ancient Win95.
by Alexandre Julliard
19 Jan '10
19 Jan '10
Module: wine Branch: master Commit: 83c422e1119f7b4768d7e06dcbb080fb3ae3a203 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=83c422e1119f7b4768d7e06dc…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 19 16:02:26 2010 +0100 shell32/tests: Fix crash on ancient Win95. --- dlls/shell32/tests/progman_dde.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 0a7fdaa..333e1f1 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -102,6 +102,30 @@ static BOOL use_common(void) return TRUE; } +static BOOL full_title(void) +{ + CABINETSTATE cs; + + memset(&cs, 0, sizeof(cs)); + if (pReadCabinetState) + { + pReadCabinetState(&cs, sizeof(cs)); + } + else + { + HKEY key; + DWORD size; + + win_skip("ReadCabinetState is not available, reading registry directly\n"); + RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key); + size = sizeof(cs); + RegQueryValueExA(key, "Settings", NULL, NULL, (LPBYTE)&cs, &size); + RegCloseKey(key); + } + + return (cs.fFullPathTitle == -1); +} + static char ProgramsDir[MAX_PATH]; static char Group1Title[MAX_PATH] = "Group1"; @@ -115,8 +139,6 @@ static void init_strings(void) char commonprograms[MAX_PATH]; char programs[MAX_PATH]; - CABINETSTATE cs; - if (pSHGetSpecialFolderPathA) { pSHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE); @@ -153,9 +175,7 @@ static void init_strings(void) else lstrcpyA(ProgramsDir, programs); - memset(&cs, 0, sizeof(cs)); - pReadCabinetState(&cs, sizeof(cs)); - if (cs.fFullPathTitle == -1) + if (full_title()) { lstrcpyA(Group1Title, ProgramsDir); lstrcatA(Group1Title, "\\Group1");
1
0
0
0
Hans Leidekker : msi: Add a test to exersize the code to retrieve rows from join tables.
by Alexandre Julliard
19 Jan '10
19 Jan '10
Module: wine Branch: master Commit: 72393c55e90477fa36c46fcda378a9b0bc53991c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=72393c55e90477fa36c46fcda…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 19 15:08:48 2010 +0100 msi: Add a test to exersize the code to retrieve rows from join tables. --- dlls/msi/tests/db.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index d3e9ad1..6a2852d 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3218,6 +3218,9 @@ static void test_join(void) ok( !lstrcmp( buf, join_res_first[i].two ), "For (row %d, column 2) expected '%s', got %s\n", i, join_res_first[i].two, buf ); + r = MsiViewModify(hview, MSIMODIFY_UPDATE, hrec); + todo_wine ok( r == ERROR_SUCCESS, "failed to modiy view: %d\n", r ); + i++; MsiCloseHandle(hrec); }
1
0
0
0
André Hentschel : msvcrt: Fix typo.
by Alexandre Julliard
19 Jan '10
19 Jan '10
Module: wine Branch: master Commit: 13e8505e58da5dc458c74bb6b140851e51aaf38f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=13e8505e58da5dc458c74bb6b…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 19 14:33:43 2010 +0100 msvcrt: Fix typo. --- dlls/msvcrt/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b216838..c60b80d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -462,7 +462,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) } /********************************************************************* - * setlocale (MSVCRT.@) + * wsetlocale (MSVCRT.@) */ MSVCRT_wchar_t* CDECL MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* locale) {
1
0
0
0
Ilya Shpigor : winex11.drv: Produce VK_CANCEL vkey on the Ctrl+Pause/ Break pressing.
by Alexandre Julliard
19 Jan '10
19 Jan '10
Module: wine Branch: master Commit: a374b3cbbede1c15361130f98485454028492e23 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a374b3cbbede1c15361130f98…
Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Tue Jan 19 11:12:45 2010 +0300 winex11.drv: Produce VK_CANCEL vkey on the Ctrl+Pause/Break pressing. --- dlls/winex11.drv/keyboard.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 4d486b0..74581cb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1140,6 +1140,11 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) * depending on the NumLock state */ return nonchar_key_vkey[keysym & 0xFF]; + /* Pressing the Pause/Break key alone produces VK_PAUSE vkey, while + * pressing Ctrl+Pause/Break produces VK_CANCEL. */ + if ((e->state & ControlMask) && (keysym == XK_Break)) + return VK_CANCEL; + TRACE_(key)("e->keycode = %x\n", e->keycode); return keyc2vkey[e->keycode];
1
0
0
0
Vitaly Lipatov : wineconsole: Fix Russian translation.
by Alexandre Julliard
19 Jan '10
19 Jan '10
Module: wine Branch: master Commit: f8562ace96af5947c59ab5b066fbd2d55d610681 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f8562ace96af5947c59ab5b06…
Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Jan 13 08:26:51 2010 +0300 wineconsole: Fix Russian translation. --- programs/wineconsole/wineconsole_Ru.rc | 33 ++++++++++++++++--------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index 0cebb2d..11ea6d3 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -2,6 +2,7 @@ * wineconsole (Russian resources) * * Copyright 2003 Igor Stepin + * Copyright 2010 Vitaly Lipatov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,36 +34,36 @@ IDS_PROPERTIES, "С&войства" IDS_MARK, "&Выделить" IDS_COPY, "&Копировать" IDS_PASTE, "&Вставить" -IDS_SELECTALL, "Выделить в&се" +IDS_SELECTALL, "Выделить в&сё" IDS_SCROLL, "Прок&рутить" IDS_SEARCH, "По&иск" IDS_FNT_DISPLAY, "Каждый символ %ld пикселей в ширину и %ld пикселей в высоту" IDS_FNT_PREVIEW_1, "Это тест" IDS_FNT_PREVIEW_2, "This is a test" -IDS_DLG_TIT_DEFAULT, "Настройка - Установки по умолчанию" -IDS_DLG_TIT_CURRENT, "Настройка - Текущие установки" -IDS_DLG_TIT_ERROR, "Ошибка настройки" +IDS_DLG_TIT_DEFAULT, "Настройка - Установки по умолчанию" +IDS_DLG_TIT_CURRENT, "Настройка - Текущие установки" +IDS_DLG_TIT_ERROR, "Ошибка настройки" IDS_DLG_ERR_SBWINSIZE, "Размер буфера экрана должен быть не менее буфера окна" -IDS_CMD_INVALID_EVENT_ID "wineconsole: Не верно указан код события\n" -IDS_CMD_INVALID_BACKEND "wineconsole: Не известный backend\n" -IDS_CMD_INVALID_OPTION "wineconsole: Указанная опция не найдена\n" +IDS_CMD_INVALID_EVENT_ID "wineconsole: Неверно указан код события\n" +IDS_CMD_INVALID_BACKEND "wineconsole: Неизвестный backend\n" +IDS_CMD_INVALID_OPTION "wineconsole: Неверный параметр командной строки\n" IDS_CMD_ABOUT "Запуск программы в консоли Wine\n" IDS_CMD_LAUNCH_FAILED "wineconsole: Не удался запуск программы '%s'.\n"\ - "Не верно указанна команда.\n" + "Неверно указана команда.\n" -IDS_USAGE_HEADER "\nВызов:\n wineconsole [опции] <команда>\n\nОпции:\n" +IDS_USAGE_HEADER "\nВызов:\n wineconsole [параметры] <команда>\n\nПараметры:\n" IDS_USAGE_BACKEND " --backend={user|curses} Выбор 'user' откроет новое окно с полной поддержкой\n"\ " всех режимов работы консоли. 'curses' - использует\n"\ " текущее окно с ограниченной функциональностью\n"\ -IDS_USAGE_COMMAND " <команда> Имя программы для запуска в консоли Wine\n" +IDS_USAGE_COMMAND " <команда> Название программы для запуска в консоли Wine\n" IDS_USAGE_FOOTER "\nНапример:\n wineconsole cmd\nЗапустить командный процессор Wine в консоли Wine\n\n" END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION " Опции " +CAPTION " Параметры " FONT 8, "MS Shell Dlg" { GROUPBOX "Размер курсора", -1, 10, 11, 60, 54, BS_GROUPBOX @@ -81,7 +82,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&История команд:", -1, 14, 77, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 82, 79, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "&Удалять дублирующиеся", IDC_OPT_HIST_NODOUBLE, 120, 77, 70, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "&Удалять повторяющиеся", IDC_OPT_HIST_NODOUBLE, 120, 77, 70, 18, WS_TABSTOP|BS_MULTILINE } IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 @@ -106,18 +107,18 @@ CAPTION " Настройка " FONT 8, "MS Shell Dlg" { GROUPBOX "Зона буфера", -1, 8, 11, 100, 42, BS_GROUPBOX - LTEXT "&Ширина :", -1, 14, 25, 54, 9 + LTEXT "&Ширина:", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "&Высота :", -1, 14, 39, 54, 9 + LTEXT "&Высота:", -1, 14, 39, 54, 9 EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 GROUPBOX "Размер окна", -1, 8, 55, 100, 42 - LTEXT "Ш&ирина :", -1, 14, 69, 54, 9 + LTEXT "Ш&ирина:", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "В&ысота :", -1, 14, 83, 54, 9 + LTEXT "В&ысота:", -1, 14, 83, 54, 9 EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0
1
0
0
0
Mike Kaplinskiy : server: Activate pending asyncs on a hangup/error.
by Alexandre Julliard
19 Jan '10
19 Jan '10
Module: wine Branch: master Commit: 8e669d9a61ba4558b5de8d63c83936684c277b2c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8e669d9a61ba4558b5de8d63c…
Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Jan 2 03:44:32 2010 -0500 server: Activate pending asyncs on a hangup/error. --- server/sock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 71d8ccb..ed89ca2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -248,13 +248,13 @@ static void sock_wake_up( struct sock *sock, int pollev ) int i; int async_active = 0; - if ( pollev & (POLLIN|POLLPRI) && async_waiting( sock->read_q )) + if ( pollev & (POLLIN|POLLPRI|POLLERR|POLLHUP) && async_waiting( sock->read_q )) { if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); async_wake_up( sock->read_q, STATUS_ALERTED ); async_active = 1; } - if ( pollev & POLLOUT && async_waiting( sock->write_q )) + if ( pollev & (POLLOUT|POLLERR|POLLHUP) && async_waiting( sock->write_q )) { if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); async_wake_up( sock->write_q, STATUS_ALERTED );
1
0
0
0
Julius Schwartzenberg : avifil32: Allow files with different extensions to be loaded.
by Alexandre Julliard
19 Jan '10
19 Jan '10
Module: wine Branch: master Commit: 65f6474c6c129b4dc8cfe72d954cf9915d4ab9ec URL:
http://source.winehq.org/git/wine.git/?a=commit;h=65f6474c6c129b4dc8cfe72d9…
Author: Julius Schwartzenberg <julius.schwartzenberg(a)gmail.com> Date: Sat Jan 9 21:05:58 2010 +0100 avifil32: Allow files with different extensions to be loaded. --- dlls/avifil32/api.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index c3dc72f..dd1c2e2 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -244,7 +244,7 @@ HRESULT WINAPI AVIFileOpenW(PAVIFILE *ppfile, LPCWSTR szFile, UINT uMode, /* if no handler then try guessing it by extension */ if (lpHandler == NULL) { if (! AVIFILE_GetFileHandlerByExtension(szFile, &clsidHandler)) - return AVIERR_UNSUPPORTED; + clsidHandler = CLSID_AVIFile; } else clsidHandler = *lpHandler;
1
0
0
0
Alexandre Julliard : winedump: Remove an unused flag.
by Alexandre Julliard
19 Jan '10
19 Jan '10
Module: wine Branch: master Commit: 4e640f8a2b0194fb5a04f602e23ad53df428ea5e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4e640f8a2b0194fb5a04f602e…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 19 13:06:19 2010 +0100 winedump: Remove an unused flag. --- tools/winedump/pe.c | 6 ++---- tools/winedump/winedump.h | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 728253e..2c84bd5 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1560,13 +1560,13 @@ static void do_grab_sym( void ) if (!pName) {printf("Can't grab functions' name table\n"); return;} pOrdl = RVA(exportDir->AddressOfNameOrdinals, exportDir->NumberOfNames * sizeof(WORD)); if (!pOrdl) {printf("Can't grab functions' ordinal table\n"); return;} + pFunc = RVA(exportDir->AddressOfFunctions, exportDir->NumberOfFunctions * sizeof(DWORD)); + if (!pFunc) {printf("Can't grab functions' address table\n"); return;} /* dll_close(); */ if (!(dll_symbols = malloc((exportDir->NumberOfFunctions + 1) * sizeof(dll_symbol)))) fatal ("Out of memory"); - if (exportDir->AddressOfFunctions != exportDir->NumberOfNames || exportDir->Base > 1) - globals.do_ordinals = 1; /* bit map of used funcs */ map = calloc(((exportDir->NumberOfFunctions + 31) & ~31) / 32, sizeof(DWORD)); @@ -1581,8 +1581,6 @@ static void do_grab_sym( void ) dll_symbols[j].ordinal = exportDir->Base + *pOrdl; assert(dll_symbols[j].symbol); } - pFunc = RVA(exportDir->AddressOfFunctions, exportDir->NumberOfFunctions * sizeof(DWORD)); - if (!pFunc) {printf("Can't grab functions' address table\n"); return;} for (i = 0; i < exportDir->NumberOfFunctions; i++) { diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 1f49369..d7e4e1d 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -136,9 +136,6 @@ typedef struct __globals /* Option arguments: dump mode */ const char *dumpsect; /* -j */ - - /* internal options */ - int do_ordinals; } _globals; extern _globals globals;
1
0
0
0
Rob Shearman : rpcrt4: Add structure definition for RPC AUTH3 packet and use the size of this on sending to fix authentication against native servers .
by Alexandre Julliard
19 Jan '10
19 Jan '10
Module: wine Branch: master Commit: c66972dfbabf5b16705716d595ee198b730f50f0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c66972dfbabf5b16705716d59…
Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Jan 19 10:30:31 2010 +0000 rpcrt4: Add structure definition for RPC AUTH3 packet and use the size of this on sending to fix authentication against native servers. Also use the new size to validate incoming AUTH3 packets to be consistent with native. --- dlls/rpcrt4/rpc_defs.h | 8 ++++++++ dlls/rpcrt4/rpc_message.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_defs.h b/dlls/rpcrt4/rpc_defs.h index 8514967..434d396 100644 --- a/dlls/rpcrt4/rpc_defs.h +++ b/dlls/rpcrt4/rpc_defs.h @@ -139,6 +139,13 @@ typedef struct unsigned short num_data_items; } RpcPktHttpHdr; +/* AUTH3 packet */ +typedef struct +{ + RpcPktCommonHdr common; + unsigned int pad; /* ignored */ +} RpcPktAuth3Hdr; + /* Union representing all possible packet headers */ typedef union { @@ -150,6 +157,7 @@ typedef union RpcPktBindAckHdr bind_ack; RpcPktBindNAckHdr bind_nack; RpcPktHttpHdr http; + RpcPktAuth3Hdr auth3; } RpcPktHdr; typedef struct diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 45a0398..0144f85 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -59,7 +59,7 @@ DWORD RPCRT4_GetHeaderSize(const RpcPktHdr *Header) sizeof(Header->request), 0, sizeof(Header->response), sizeof(Header->fault), 0, 0, 0, 0, 0, 0, 0, sizeof(Header->bind), sizeof(Header->bind_ack), sizeof(Header->bind_nack), - 0, 0, sizeof(Header->common), 0, 0, 0, sizeof(Header->http) + 0, 0, sizeof(Header->auth3), 0, 0, 0, sizeof(Header->http) }; ULONG ret = 0; @@ -217,12 +217,12 @@ static RpcPktHdr *RPCRT4_BuildAuthHeader(ULONG DataRepresentation) RpcPktHdr *header; header = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(header->common)); + sizeof(header->auth3)); if (header == NULL) return NULL; RPCRT4_BuildCommonHeader(header, PKT_AUTH3, DataRepresentation); - header->common.frag_len = sizeof(header->common); + header->common.frag_len = sizeof(header->auth3); return header; }
1
0
0
0
← Newer
1
...
28
29
30
31
32
33
34
...
62
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
Results per page:
10
25
50
100
200