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
July
June
May
April
March
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
May 2007
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 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
715 discussions
Start a n
N
ew thread
Andrew Talbot : oleaut32: Exclude unused headers.
by Alexandre Julliard
16 May '07
16 May '07
Module: wine Branch: master Commit: 048a5d6fc51dd9c1fc8df32e998618c1cda7227e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=048a5d6fc51dd9c1fc8df32e9…
Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 15 22:28:25 2007 +0100 oleaut32: Exclude unused headers. --- dlls/oleaut32/dispatch.c | 2 -- dlls/oleaut32/tmarshal.c | 1 - dlls/oleaut32/typelib16.c | 1 - dlls/oleaut32/typelib2.c | 1 - 4 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 707428f..8ab1c5e 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -34,8 +34,6 @@ #include "objbase.h" #include "oleauto.h" #include "winerror.h" -#include "winreg.h" -#include "winnls.h" /* for PRIMARYLANGID */ #include "wine/debug.h" diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 3783aca..94c6e58 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -40,7 +40,6 @@ #include "winnls.h" #include "winreg.h" #include "winuser.h" -#include "excpt.h" #include "ole2.h" #include "propidl.h" /* for LPSAFEARRAY_User* functions */ diff --git a/dlls/oleaut32/typelib16.c b/dlls/oleaut32/typelib16.c index 69b4f65..a010f7d 100644 --- a/dlls/oleaut32/typelib16.c +++ b/dlls/oleaut32/typelib16.c @@ -33,7 +33,6 @@ #include "winerror.h" #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winreg.h" #include "winuser.h" diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 5f3ead1..874d8a8 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -43,7 +43,6 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "winreg.h" #include "winuser.h" #include "wine/unicode.h"
1
0
0
0
Andrew Talbot : oledlg: Exclude unused header.
by Alexandre Julliard
16 May '07
16 May '07
Module: wine Branch: master Commit: ddb0a188bed322f0beffd79a89eb3baedf499ae3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ddb0a188bed322f0beffd79a8…
Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 15 22:28:28 2007 +0100 oledlg: Exclude unused header. --- dlls/oledlg/insobjdlg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index e945a07..8ddf227 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "winreg.h" #include "winternl.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "winuser.h"
1
0
0
0
Andrew Talbot : ole32: Exclude unused headers.
by Alexandre Julliard
16 May '07
16 May '07
Module: wine Branch: master Commit: 4ea954df4227a2d8b59280d19b1448c64d402f78 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4ea954df4227a2d8b59280d19…
Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 15 22:28:23 2007 +0100 ole32: Exclude unused headers. --- dlls/ole32/classmoniker.c | 1 - dlls/ole32/hglobalstream.c | 1 - dlls/ole32/ole16.c | 1 - dlls/ole32/ole2.c | 2 -- dlls/ole32/ole2_16.c | 4 ---- dlls/ole32/ole2impl.c | 1 - dlls/ole32/ole2nls.c | 3 --- dlls/ole32/ole32_main.c | 1 - dlls/ole32/oleproxy.c | 1 - dlls/ole32/stg_stream.c | 1 - dlls/ole32/storage.c | 1 - 11 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 07db622..514990a 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -31,7 +31,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "wine/debug.h" #include "ole2.h" #include "wine/unicode.h" diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index d98c0c5..872fb24 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -39,7 +39,6 @@ #include "objbase.h" #include "ole2.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index d9c2202..b89efa8 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -35,7 +35,6 @@ #include "winuser.h" #include "objbase.h" #include "ole2.h" -#include "ole2ver.h" #include "rpc.h" #include "winerror.h" #include "winreg.h" diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 8ad9953..4fe31b0 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -41,10 +41,8 @@ #include "winuser.h" #include "winnls.h" #include "winreg.h" -#include "commctrl.h" #include "ole2.h" #include "ole2ver.h" -#include "wownt32.h" #include "wine/unicode.h" #include "compobj_private.h" diff --git a/dlls/ole32/ole2_16.c b/dlls/ole32/ole2_16.c index 20e9725..90a1ed2 100644 --- a/dlls/ole32/ole2_16.c +++ b/dlls/ole32/ole2_16.c @@ -35,12 +35,8 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" -#include "commctrl.h" #include "ole2.h" -#include "ole2ver.h" #include "winerror.h" -#include "wownt32.h" #include "wine/winbase16.h" #include "wine/wingdi16.h" diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index f123fe9..da50f4a 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -32,7 +32,6 @@ #include "wine/debug.h" #include "ole2.h" #include "olestd.h" -#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c index 9851d70..f42ddf9 100644 --- a/dlls/ole32/ole2nls.c +++ b/dlls/ole32/ole2nls.c @@ -31,11 +31,8 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "winnls.h" -#include "winreg.h" #include "winuser.h" -#include "winver.h" #include "wine/winbase16.h" diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 328a972..1d58d55 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -22,7 +22,6 @@ #include <stdio.h> #include "windef.h" -#include "winerror.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index dd12e5c..e807941 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -53,7 +53,6 @@ #include "ole2.h" #include "rpc.h" #include "winerror.h" -#include "winreg.h" #include "wtypes.h" #include "compobj_private.h" diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index e144b2c..1bcb40b 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -36,7 +36,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index 401c984..b2b89ff 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -36,7 +36,6 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winternl.h" #include "winerror.h" #include "wine/winbase16.h"
1
0
0
0
Erez Volk : ntdll: Added IDT Timezone (Israel daylight savings time).
by Alexandre Julliard
16 May '07
16 May '07
Module: wine Branch: master Commit: 14a32754362d3afa36e40d928fc91a43051ce317 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=14a32754362d3afa36e40d928…
Author: Erez Volk <erez.volk(a)gmail.com> Date: Tue May 15 20:43:51 2007 +0300 ntdll: Added IDT Timezone (Israel daylight savings time). --- dlls/ntdll/time.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 30c71db..1159a89 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -233,6 +233,9 @@ static const struct tagTZ_INFO TZ_INFO[] = {"IST", {'I','s','r','a','e','l',' ','S','t','a','n','d','a','r','d',' ','T','i', 'm','e','\0'}, -120, 0}, + {"IDT", + {'I','s','r','a','e','l',' ','S','t','a','n','d','a','r','d',' ','T','i', + 'm','e','\0'}, -180, 1}, {"MSK", {'R','u','s','s','i','a','n',' ','S','t','a','n','d','a','r','d',' ','T', 'i','m','e','\0'}, -180, 0},
1
0
0
0
Mikołaj Zalewski : comctl32: toolbar: TB_SETIMAGELIST should try to preserve button width.
by Alexandre Julliard
16 May '07
16 May '07
Module: wine Branch: master Commit: 7b8241b1ee1c7f9126423bda85f3fa8acc849ead URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7b8241b1ee1c7f9126423bda8…
Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue May 15 18:54:03 2007 +0200 comctl32: toolbar: TB_SETIMAGELIST should try to preserve button width. --- dlls/comctl32/tests/toolbar.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 3 +++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index e2d5095..f997b61 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -678,6 +678,14 @@ static tbsize_result_t tbsize_results[] = { {0, 0, 672, 26}, {489, 39}, 3, { { 0, 2, 163, 41}, {163, 2, 330, 41}, {330, 2, 493, 41}, }, }, + { {0, 0, 672, 104}, {978, 24}, 6, { + { 0, 2, 163, 26}, {163, 2, 326, 26}, {326, 2, 489, 26}, + {489, 2, 652, 26}, {652, 2, 819, 26}, {819, 2, 850, 26}, + }, }, + { {0, 0, 672, 28}, {978, 38}, 6, { + { 0, 0, 163, 38}, {163, 0, 326, 38}, {326, 0, 489, 38}, + {489, 0, 652, 38}, {652, 0, 819, 38}, {819, 0, 850, 38}, + }, }, }; static int tbsize_numtests = 0; @@ -725,6 +733,7 @@ static TBBUTTON buttons3[] = { static void test_sizes(void) { HWND hToolbar = NULL; + HIMAGELIST himl; int style; int i; @@ -855,7 +864,36 @@ static void test_sizes(void) ok(SendMessageA(hToolbar, TB_SETSTATE, 20, TBSTATE_ENABLED), "TB_SETSTATE failed\n"); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(23, 22), "Unexpected button size\n"); + /* TB_SETIMAGELIST always changes the height but the width only if necessary */ + SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); + himl = ImageList_LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_BITMAP_80x15), 20, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 21), "Unexpected button size\n"); + SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 100), "Unexpected button size\n"); + SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(1, 1)); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 21), "Unexpected button size\n"); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, 0) == (LRESULT)himl, "TB_SETIMAGELIST failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 7), "Unexpected button size\n"); + SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(1, 1)); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(8, 7), "Unexpected button size\n"); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 21), "Unexpected button size\n"); + /* the text is taken into account */ + SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"A\0MMMMMMMMMMMMM\0"); + SendMessageA(hToolbar, TB_ADDBUTTONS, 4, (LPARAM)buttons3); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(163, 38), "Unexpected button size\n"); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, 0) == (LRESULT)himl, "TB_SETIMAGELIST failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(163, 24), "Unexpected button size\n"); + /* the style change also comes into effect */ + check_sizes(); + SetWindowLong(hToolbar, GWL_STYLE, GetWindowLong(hToolbar, GWL_STYLE) | TBSTYLE_FLAT); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); + check_sizes_todo(0x30); /* some small problems with BTNS_AUTOSIZE button sizes */ + rebuild_toolbar(&hToolbar); + ImageList_Destroy(himl); + SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 39), "Unexpected button size\n"); SendMessageA(hToolbar, TB_DELETEBUTTON, 0, 0); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 89037c4..9be48ea 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4791,6 +4791,7 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); HIMAGELIST himlTemp; HIMAGELIST himl = (HIMAGELIST)lParam; + INT oldButtonWidth = infoPtr->nButtonWidth; INT i, id = 0; if (infoPtr->iVersion >= 5) @@ -4810,6 +4811,8 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) infoPtr->nBitmapHeight = 1; } TOOLBAR_CalcToolbar(hwnd); + if (infoPtr->nButtonWidth < oldButtonWidth) + TOOLBAR_SetButtonSize(hwnd, 0, MAKELONG(oldButtonWidth, infoPtr->nButtonHeight)); TRACE("hwnd %p, new himl=%p, id = %d, count=%d, bitmap w=%d, h=%d\n", hwnd, infoPtr->himlDef, id, infoPtr->nNumBitmaps,
1
0
0
0
Dmitry Timoshkov : kernel32: Add a test for LoadLibraryEx( LOAD_LIBRARY_AS_DATAFILE).
by Alexandre Julliard
16 May '07
16 May '07
Module: wine Branch: master Commit: 59a2686ae400a2225cb7858d26c9b35ec1ec873a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=59a2686ae400a2225cb7858d2…
Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 16 01:10:29 2007 +0900 kernel32: Add a test for LoadLibraryEx(LOAD_LIBRARY_AS_DATAFILE). --- dlls/kernel32/tests/loader.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ea5bb21..b67b81d 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -231,7 +231,8 @@ START_TEST(loader) static const char section_data[0x10] = "section data"; int i; DWORD dummy, file_size, file_align; - HANDLE hfile, hlib; + HANDLE hfile; + HMODULE hlib, hlib_as_data_file; SYSTEM_INFO si; char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; @@ -421,7 +422,33 @@ START_TEST(loader) } SetLastError(0xdeadbeef); + hlib_as_data_file = LoadLibraryEx(dll_name, 0, LOAD_LIBRARY_AS_DATAFILE); + ok(hlib_as_data_file != 0, "LoadLibraryEx error %u\n", GetLastError()); +todo_wine ok(hlib_as_data_file == hlib, "hlib_as_file and hlib are different\n"); + + SetLastError(0xdeadbeef); ok(FreeLibrary(hlib), "FreeLibrary error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hlib = GetModuleHandle(dll_name); +todo_wine ok(hlib != 0, "GetModuleHandle error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ok(FreeLibrary(hlib_as_data_file), "FreeLibrary error %d\n", GetLastError()); + + hlib = GetModuleHandle(dll_name); + ok(!hlib, "GetModuleHandle should fail\n"); + + SetLastError(0xdeadbeef); + hlib_as_data_file = LoadLibraryEx(dll_name, 0, LOAD_LIBRARY_AS_DATAFILE); + ok(hlib_as_data_file != 0, "LoadLibraryEx error %u\n", GetLastError()); + ok((ULONG_PTR)hlib_as_data_file & 1, "hlib_as_data_file is even\n"); + + hlib = GetModuleHandle(dll_name); + ok(!hlib, "GetModuleHandle should fail\n"); + + SetLastError(0xdeadbeef); + ok(FreeLibrary(hlib_as_data_file), "FreeLibrary error %d\n", GetLastError()); } else { /* LoadLibrary is expected to fail */
1
0
0
0
Alexandre Julliard : ntoskrnl.exe: Added IofCompleteRequest.
by Alexandre Julliard
16 May '07
16 May '07
Module: wine Branch: master Commit: e2d94ec0014cb8b167d9598c15b3f7d4f60ffb04 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e2d94ec0014cb8b167d9598c1…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 21:56:05 2007 +0200 ntoskrnl.exe: Added IofCompleteRequest. --- dlls/ntoskrnl.exe/ntoskrnl.c | 31 +++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8ed3a51..8884622 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -51,6 +51,22 @@ typedef struct _KSERVICE_TABLE_DESCRIPTOR KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4]; +#ifdef __i386__ +#define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ + __ASM_GLOBAL_FUNC( name, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name ) +#define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ + __ASM_GLOBAL_FUNC( name, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name ) +#endif + static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -183,6 +199,21 @@ NTSTATUS WINAPI IoCreateSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *targ } +/*********************************************************************** + * IofCompleteRequest (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( IofCompleteRequest ) +void WINAPI __regs_IofCompleteRequest( IRP *irp, UCHAR priority_boost ) +#else +void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) +#endif +{ + TRACE( "%p %u\n", irp, priority_boost ); + /* nothing to do for now */ +} + + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 871216e..5bfd792 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -40,7 +40,7 @@ @ stub IoSetPartitionInformation @ stub IoWritePartitionTable @ stub IofCallDriver -@ stub IofCompleteRequest +@ stdcall -norelay IofCompleteRequest(ptr long) @ stub KeAcquireInStackQueuedSpinLockAtDpcLevel @ stub KeReleaseInStackQueuedSpinLockFromDpcLevel @ stub KeSetTimeUpdateNotifyRoutine
1
0
0
0
Alexandre Julliard : ntoskrnl.exe: Export KeServiceDescriptorTable and KeTickCount.
by Alexandre Julliard
16 May '07
16 May '07
Module: wine Branch: master Commit: 72f2ba6fc41dd3bbfd5c287b9f954e2c3d383cc0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=72f2ba6fc41dd3bbfd5c287b9…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 21:49:26 2007 +0200 ntoskrnl.exe: Export KeServiceDescriptorTable and KeTickCount. --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0aa84b4..8ed3a51 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -37,6 +37,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); + +KSYSTEM_TIME KeTickCount; + +typedef struct _KSERVICE_TABLE_DESCRIPTOR +{ + PULONG_PTR Base; + PULONG Count; + ULONG Limit; + PUCHAR Number; +} KSERVICE_TABLE_DESCRIPTOR, *PKSERVICE_TABLE_DESCRIPTOR; + +KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4]; + + static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d5eeb9a..871216e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -603,7 +603,7 @@ @ stub KeRundownQueue @ stub KeSaveFloatingPointState @ stub KeSaveStateForHibernate -@ stub KeServiceDescriptorTable +@ extern KeServiceDescriptorTable @ stub KeSetAffinityThread @ stub KeSetBasePriorityThread @ stub KeSetDmaIoCoherency @@ -622,7 +622,7 @@ @ stub KeStackAttachProcess @ stub KeSynchronizeExecution @ stub KeTerminateThread -@ stub KeTickCount +@ extern KeTickCount @ stub KeUnstackDetachProcess @ stub KeUpdateRunTime @ stub KeUpdateSystemTime
1
0
0
0
Alexandre Julliard : ntoskrnl.exe: Implemented IoCreateSymbolicLink.
by Alexandre Julliard
16 May '07
16 May '07
Module: wine Branch: master Commit: 7330edd25dbebb1cfb856bdf1ae3c627c5ba123f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7330edd25dbebb1cfb856bdf1…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 21:45:51 2007 +0200 ntoskrnl.exe: Implemented IoCreateSymbolicLink. --- dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ae78665..0aa84b4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -148,6 +148,27 @@ void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) } +/*********************************************************************** + * IoCreateSymbolicLink (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *target ) +{ + HANDLE handle; + OBJECT_ATTRIBUTES attr; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = name; + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + TRACE( "%s -> %s\n", debugstr_us(name), debugstr_us(target) ); + /* FIXME: store handle somewhere */ + return NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, target ); +} + + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 04591ba..d5eeb9a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -345,7 +345,7 @@ @ stub IoCreateStreamFileObject @ stub IoCreateStreamFileObjectEx @ stub IoCreateStreamFileObjectLite -@ stub IoCreateSymbolicLink +@ stdcall IoCreateSymbolicLink(ptr ptr) @ stub IoCreateSynchronizationEvent @ stub IoCreateUnprotectedSymbolicLink @ stub IoCsqInitialize
1
0
0
0
Alexandre Julliard : ntoskrnl.exe: Implemented IoCreateDevice and IoDeleteDevice.
by Alexandre Julliard
16 May '07
16 May '07
Module: wine Branch: master Commit: a2adc8881554887c03ed985a6d08c565e675e657 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a2adc8881554887c03ed985a6…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 21:41:50 2007 +0200 ntoskrnl.exe: Implemented IoCreateDevice and IoDeleteDevice. --- dlls/ntoskrnl.exe/Makefile.in | 3 + dlls/ntoskrnl.exe/ntoskrnl.c | 163 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- 3 files changed, 168 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 448eb1f..2e91316 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -6,6 +6,9 @@ MODULE = ntoskrnl.exe IMPORTLIB = libntoskrnl.exe.$(IMPLIBEXT) IMPORTS = kernel32 ntdll +C_SRCS = \ + ntoskrnl.c + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c new file mode 100644 index 0000000..ae78665 --- /dev/null +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -0,0 +1,163 @@ +/* + * ntoskrnl.exe implementation + * + * Copyright (C) 2007 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/unicode.h" +#include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); + +static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) +{ + if (!us) return "<null>"; + return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); +} + +static HANDLE get_device_manager(void) +{ + static HANDLE device_manager; + HANDLE handle = 0, ret = device_manager; + + if (!ret) + { + SERVER_START_REQ( create_device_manager ) + { + req->access = SYNCHRONIZE; + req->attributes = 0; + if (!wine_server_call( req )) handle = reply->handle; + } + SERVER_END_REQ; + + if (!handle) + { + ERR( "failed to create the device manager\n" ); + return 0; + } + if (!(ret = InterlockedCompareExchangePointer( &device_manager, handle, 0 ))) + ret = handle; + else + NtClose( handle ); /* somebody beat us to it */ + } + return ret; +} + + +/*********************************************************************** + * IoCreateDevice (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, + UNICODE_STRING *name, DEVICE_TYPE type, + ULONG characteristics, BOOLEAN exclusive, + DEVICE_OBJECT **ret_device ) +{ + NTSTATUS status; + DEVICE_OBJECT *device; + HANDLE handle = 0; + HANDLE manager = get_device_manager(); + + TRACE( "(%p, %u, %s, %u, %x, %u, %p)\n", + driver, ext_size, debugstr_us(name), type, characteristics, exclusive, ret_device ); + + if (!(device = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*device) + ext_size ))) + return STATUS_NO_MEMORY; + + SERVER_START_REQ( create_device ) + { + req->access = 0; + req->attributes = 0; + req->rootdir = 0; + req->manager = manager; + req->user_ptr = device; + if (name) wine_server_add_data( req, name->Buffer, name->Length ); + if (!(status = wine_server_call( req ))) handle = reply->handle; + } + SERVER_END_REQ; + + if (status == STATUS_SUCCESS) + { + device->DriverObject = driver; + device->DeviceExtension = device + 1; + device->DeviceType = type; + device->Reserved = handle; + + device->NextDevice = driver->DeviceObject; + driver->DeviceObject = device; + + *ret_device = device; + } + else HeapFree( GetProcessHeap(), 0, device ); + + return status; +} + + +/*********************************************************************** + * IoDeleteDevice (NTOSKRNL.EXE.@) + */ +void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) +{ + NTSTATUS status; + + TRACE( "%p\n", device ); + + SERVER_START_REQ( delete_device ) + { + req->handle = device->Reserved; + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status == STATUS_SUCCESS) + { + DEVICE_OBJECT **prev = &device->DriverObject->DeviceObject; + while (*prev && *prev != device) prev = &(*prev)->NextDevice; + if (*prev) *prev = (*prev)->NextDevice; + NtClose( device->Reserved ); + HeapFree( GetProcessHeap(), 0, device ); + } +} + + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4e6a38c..04591ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -336,7 +336,7 @@ @ stub IoCompleteRequest @ stub IoConnectInterrupt @ stub IoCreateController -@ stub IoCreateDevice +@ stdcall IoCreateDevice(ptr long ptr long long long ptr) @ stub IoCreateDisk @ stub IoCreateDriver @ stub IoCreateFile @@ -353,7 +353,7 @@ @ stub IoCsqRemoveIrp @ stub IoCsqRemoveNextIrp @ stub IoDeleteController -@ stub IoDeleteDevice +@ stdcall IoDeleteDevice(ptr) @ stub IoDeleteDriver @ stub IoDeleteSymbolicLink @ stub IoDetachDevice
1
0
0
0
← Newer
1
...
32
33
34
35
36
37
38
...
72
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
63
64
65
66
67
68
69
70
71
72
Results per page:
10
25
50
100
200