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
August 2006
----- 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
5 participants
746 discussions
Start a n
N
ew thread
Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : winecfg: Updated Korean resource.
by Alexandre Julliard
17 Aug '06
17 Aug '06
Module: wine Branch: master Commit: 205631ba687177b0861c1cc7a840982e64081522 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=205631ba687177b0861c1cc…
Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Aug 17 09:10:04 2006 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 6c4c9a6..9e6e1ef 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -71,10 +71,9 @@ BEGIN LTEXT "Wineâ���� â�����ڿ� ���ؼ� �����ȴٸ�, Wineâ���� ǥ�� âƲ�� ���� ���̸�, �۾����� �����ڿ� �� ��︱ ���Դϴ�. ���� â��Ͽ��� ��Ÿ�� ���Դϴ�.\n\n��� Wineâ���� â�����ڿ� ���� �������� �ʴ´ٸ�, Wienâ���� â�����ڿ� ������� ���� ���Դϴ�. �̰��� Wineâ���� ����ũž�� �����ϰ� ���յ��� �ʴ´ٴ� ���� �ǹ��մϴ�. ������ Wine�� �������� �䳻���Ⱑ �� ���������� ��� ���α����� �� �� �� ������ �� �ֵ��� �����ݴϴ�.", IDC_STATIC,15,37,228,80 CONTROL "â�����ڰ� Wineâ�� �����ϵ��� ��",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 - - /* FIXME: the wording of this explanation could be a lot better */ - LTEXT "Wine�� ��� Wineâ���� �ϳ��� '���� ȭ��'�� ���Եǵ���, �������� ����ũž�� �䳻�� �� �ֽ��ϴ�. �Ǵ� Wine�� Wineâ���� ����� ǥ�� ����ũž ���� ��ġ�ϵ��� �� �� �ֽ��ϴ�.", - IDC_STATIC,15,121,228,28 + LTEXT "����� ��� �������� ���α��� ����ũž���� ������ �ൿ�� �ϰ� �� ������, ���� �ٸ� �ൿ�� �ϰ� �� ������ ������ �� �ֽ��ϴ�.", + IDC_STATIC,15,125,228,28 + LTEXT "����ũž ũ��:",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED CONTROL "���� ����ũž �䳻����",IDC_ENABLE_DESKTOP,"Button", @@ -229,8 +228,8 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "����Ƽ��, ����" IDS_DLL_BUILTIN_NATIVE "����, ����Ƽ��" IDS_DLL_DISABLED "������� ����" - IDS_DEFAULT_SETTINGS "Default Settings" - IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" - IDS_USE_GLOBAL_SETTINGS "Use global settings" - IDS_SELECT_EXECUTABLE "Select an executable file" + IDS_DEFAULT_SETTINGS "�⺻ ����" + IDS_EXECUTABLE_FILTER "Wine ���α� (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "��ü ���� ���" + IDS_SELECT_EXECUTABLE "���� ���� ����" END
1
0
0
0
Fatih Aşıcı : winecfg: Update Turkish resource file.
by Alexandre Julliard
17 Aug '06
17 Aug '06
Module: wine Branch: master Commit: f389e20fee0d1e5c78e02bf219e8e4558c3ff284 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=f389e20fee0d1e5c78e02bf…
Author: Fatih Aşıcı <fatih.asici(a)gmail.com> Date: Thu Aug 17 00:38:00 2006 +0300 winecfg: Update Turkish resource file. --- programs/winecfg/Tr.rc | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index dba3d81..ad5a8ab 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -62,11 +62,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Pencere ayarlar� ",IDC_STATIC,8,25,244,180 - CONTROL "DirectX uygulamalar�n�n fareyi pencere i�ine kilitlemelerine izin ver",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 - CONTROL "Masa�st� �ift tamponlamay� etkinle�tir",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - LTEXT "Pencereler pencere y�neticiniz taraf�ndan y�netildi�inde, standart kenarlara sahip olacak, sanal masa�st�n�ze uygun davranacak ve pencere listenizde g�r�necektir. \n\nE�er pencereler y�netilmezse, pencere y�neticinizden ba��ms�z olacaklard�r. Bu, pencerelerin masa�st�n�zle tam olarak b�t�nle�emeyece�i anlam�na gelir; ama em�lasyon daha d�zg�n yap�labilice�inden baz� programlar daha iyi �al��abilir.", + CONTROL "DirectX uygulamalar�n�n fareyi pencere i�ine kilitlemelerine izin ver",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 + CONTROL "Masa�st� �ift tamponlamay� etkinle�tir",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + LTEXT "Pencereler pencere y�neticiniz taraf�ndan y�netildi�inde, standart kenarlara sahip olacak, sanal masa�st�n�ze uygun davranacak ve pencere listenizde g�r�necektir. \n\nE�er pencereler y�netilmezse, pencere y�neticinizden ba��ms�z olacaklard�r. Bu, pencerelerin masa�st�n�zle tam olarak b�t�nle�emeyece�i anlam�na gelir; ama em�lasyon daha d�zg�n yap�labilice�inden baz� programlar daha iyi �al��abilir.", IDC_STATIC,15,58,228,80 - CONTROL "Pencere y�neticisinin pencereleri y�netmesine izin ver",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 + CONTROL "Pencere y�neticisinin pencereleri y�netmesine izin ver",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 LTEXT "T�m pencerelerin sanal bir ekrana hapsedildi�i bir windows masa�st� em�le edebilirsiniz veya pencerelerin standart masa�st�n�ze yerle�mesini sa�layabilirsiniz.", IDC_STATIC,15,146,228,28 @@ -80,7 +80,7 @@ BEGIN GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "Vertex Shader Deste�i: ",IDC_STATIC,15,220,80,30 + LTEXT "Vertex Shader Deste�i: ",IDC_STATIC,15,220,80,30 COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Pixel Shader'a izin ver (donan�m destekliyorsa)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 @@ -161,9 +161,9 @@ BEGIN GROUPBOX " S�r�c� Se�imi ",IDC_STATIC,8,4,244,195 LTEXT "�stedi�iniz s�r�c�n�n kutusunu i�aretleyerek bir ses s�r�c�s� se�in. Hi�bir s�r�c� se�meyerek sesi etkisizle�tirebilirsiniz. Birden fazla s�r�c� se�imi �nerilmez. �zerine sa� t�klayarak bir s�r�c�y� yap�land�r�n.",IDC_STATIC,15,20,227,30 CONTROL "Ayg�tlar",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 - PUSHBUTTON "Denetin Masas�",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 + PUSHBUTTON "Denetim Masas�",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 - LTEXT "Donan�m H�zland�rmas�: ",IDC_STATIC,15,215,90,10 + LTEXT "Donan�m H�zland�rmas�: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "�ntan�ml� �rnekleme H�z�:",IDC_STATIC,15,232,70,8 COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -217,15 +217,15 @@ END STRINGTABLE DISCARDABLE BEGIN -IDS_DLL_WARNING "Bu kitapl���n y�kleme s�ras�n�n de�i�tirilmesi �nerilmez.\nBunu yapmak istedi�inizden emin misiniz?" -IDS_DLL_WARNING_CAPTION "Uyar�: sistem kitapl���" -IDS_DLL_NATIVE "do�al" -IDS_DLL_BUILTIN "yerle�ik" -IDS_DLL_NATIVE_BUILTIN "do�al, yerle�ik" -IDS_DLL_BUILTIN_NATIVE "yerle�ik, do�al" -IDS_DLL_DISABLED "devre d���" - IDS_DEFAULT_SETTINGS "Default Settings" - IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" - IDS_USE_GLOBAL_SETTINGS "Use global settings" - IDS_SELECT_EXECUTABLE "Select an executable file" + IDS_DLL_WARNING "Bu kitapl���n y�kleme s�ras�n�n de�i�tirilmesi �nerilmez.\nBunu yapmak istedi�inizden emin misiniz?" + IDS_DLL_WARNING_CAPTION "Uyar�: sistem kitapl���" + IDS_DLL_NATIVE "do�al" + IDS_DLL_BUILTIN "yerle�ik" + IDS_DLL_NATIVE_BUILTIN "do�al, yerle�ik" + IDS_DLL_BUILTIN_NATIVE "yerle�ik, do�al" + IDS_DLL_DISABLED "devre d���" + IDS_DEFAULT_SETTINGS "�ntan�ml� Ayarlar" + IDS_EXECUTABLE_FILTER "Wine Programlar� (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Genel ayarlar� kullan" + IDS_SELECT_EXECUTABLE "�al��t�r�labilir bir dosya se�in" END
1
0
0
0
Alexander Nicolaysen Sørnes : winecfg: Updated Norwegian Bokmål resources.
by Alexandre Julliard
17 Aug '06
17 Aug '06
Module: wine Branch: master Commit: 00304d2ec2150d2492f82015afd94848cc3b55d8 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=00304d2ec2150d2492f8201…
Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 16 19:23:33 2006 +0200 winecfg: Updated Norwegian Bokmål resources. --- programs/winecfg/No.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 7cba3eb..00c2788 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -224,8 +224,8 @@ END IDS_DLL_NATIVE_BUILTIN "innf�dt, innebygget" IDS_DLL_BUILTIN_NATIVE "innebygget, innf�dt" IDS_DLL_DISABLED "sl�tt av" - IDS_DEFAULT_SETTINGS "Default Settings" - IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" - IDS_USE_GLOBAL_SETTINGS "Use global settings" - IDS_SELECT_EXECUTABLE "Select an executable file" + IDS_DEFAULT_SETTINGS "Globale innstillinger" + IDS_EXECUTABLE_FILTER "Wine-programmer (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Bruk globale innstillinger" + IDS_SELECT_EXECUTABLE "Velg en programfil" END
1
0
0
0
Oleg Krylov : comctl32: toolbar: Use HOT imagelist for buttons in CHECKED state.
by Alexandre Julliard
17 Aug '06
17 Aug '06
Module: wine Branch: master Commit: 3e68a1f1ff10f1a28a904de5e7946362f23f3cc7 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=3e68a1f1ff10f1a28a904de…
Author: Oleg Krylov <oleg.krylov(a)gmail.com> Date: Wed Aug 16 20:59:46 2006 +0300 comctl32: toolbar: Use HOT imagelist for buttons in CHECKED state. --- dlls/comctl32/toolbar.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e84150e..c1926cb 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -696,8 +696,9 @@ TOOLBAR_DrawImage(TOOLBAR_INFO *infoPtr, draw_masked = TRUE; } } - else if ((tbcd->nmcd.uItemState & CDIS_HOT) - && ((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf))) + else if (tbcd->nmcd.uItemState & CDIS_CHECKED || + ((tbcd->nmcd.uItemState & CDIS_HOT) + && ((infoPtr->dwStyle & TBSTYLE_FLAT) || GetWindowTheme (infoPtr->hwndSelf)))) { /* if hot, attempt to draw with hot image list, if fails, use default image list */
1
0
0
0
Frank Richter : winecfg: Fix issues with LVM_GETITEMW by removing superfluous flag.
by Alexandre Julliard
17 Aug '06
17 Aug '06
Module: wine Branch: master Commit: 58f488e5f597de8669914ef13b027b86b4563bae URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=58f488e5f597de8669914ef…
Author: Frank Richter <frank.richter(a)gmail.com> Date: Wed Aug 16 20:46:13 2006 +0200 winecfg: Fix issues with LVM_GETITEMW by removing superfluous flag. --- programs/winecfg/appdefaults.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index bca7f7a..ad6b7cc 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -314,7 +314,7 @@ static void on_remove_app_click(HWND dia LVITEMW item; item.iItem = selection; - item.mask = LVIF_PARAM | LVIF_TEXT; + item.mask = LVIF_PARAM; WINE_TRACE("selection=%d, section=%s\n", selection, section);
1
0
0
0
Frank Richter : winecfg: Use WCHARs for window title, current app.
by Alexandre Julliard
17 Aug '06
17 Aug '06
Module: wine Branch: master Commit: 6b3d624d4b39206541849bd08c15cd40c25f7b87 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=6b3d624d4b39206541849bd…
Author: Frank Richter <frank.richter(a)gmail.com> Date: Wed Aug 16 18:30:48 2006 +0200 winecfg: Use WCHARs for window title, current app. --- programs/winecfg/appdefaults.c | 25 ++++++++++--------------- programs/winecfg/winecfg.c | 23 +++++++++++++---------- programs/winecfg/winecfg.h | 2 +- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 8725757..bca7f7a 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -153,7 +153,9 @@ static void init_appsheet(HWND dialog) /* we use the lparam field of the item so we can alter the presentation later and not change code * for instance, to use the tile view or to display the EXEs embedded 'display name' */ - add_listview_item(listview, load_string (IDS_DEFAULT_SETTINGS), NULL); + LoadStringW (GetModuleHandle (NULL), IDS_DEFAULT_SETTINGS, appname, + sizeof(appname)/sizeof(appname[0])); + add_listview_item(listview, appname, NULL); /* because this list is only populated once, it's safe to bypass the settings list here */ if (RegOpenKey(config_key, "AppDefaults", &key) == ERROR_SUCCESS) @@ -208,7 +210,7 @@ static int get_listview_selection(HWND l static void on_selection_change(HWND dialog, HWND listview) { LVITEM item; - char *oldapp = current_app; + WCHAR* oldapp = current_app; WINE_TRACE("()\n"); @@ -221,11 +223,11 @@ static void on_selection_change(HWND dia SendMessage(listview, LVM_GETITEM, 0, (LPARAM) &item); - current_app = (char *) item.lParam; + current_app = (WCHAR*) item.lParam; if (current_app) { - WINE_TRACE("current_app is now %s\n", current_app); + WINE_TRACE("current_app is now %s\n", wine_dbgstr_w (current_app)); enable(IDC_APP_REMOVEAPP); } else @@ -287,21 +289,15 @@ static void on_add_app_click(HWND dialog HWND listview = GetDlgItem(dialog, IDC_APP_LISTVIEW); int count = ListView_GetItemCount(listview); WCHAR* new_app; - char* new_appA; - DWORD new_appA_len; - new_app = strdupW(filetitle); - - if (list_contains_file(listview, new_app)) + if (list_contains_file(listview, filetitle)) return; + new_app = strdupW(filetitle); + WINE_TRACE("adding %s\n", wine_dbgstr_w (new_app)); - new_appA_len = WideCharToMultiByte (CP_ACP, 0, new_app, -1, NULL, 0, NULL, NULL); - new_appA = HeapAlloc (GetProcessHeap(), 0, new_appA_len); - WideCharToMultiByte (CP_ACP, 0, new_app, -1, new_appA, new_appA_len, NULL, NULL); - - add_listview_item(listview, new_app, new_appA); + add_listview_item(listview, new_app, new_app); ListView_SetItemState(listview, count, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); @@ -327,7 +323,6 @@ static void on_remove_app_click(HWND dia section[strlen(section)] = '\0'; /* remove last backslash */ set_reg_key(config_key, section, NULL, NULL); /* delete the section */ SendMessage(listview, LVM_GETITEMW, 0, (LPARAM) &item); - HeapFree (GetProcessHeap(), 0, item.pszText); HeapFree (GetProcessHeap(), 0, (void*)item.lParam); SendMessage(listview, LVM_DELETEITEM, selection, 0); ListView_SetItemState(listview, selection - 1, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED); diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index dfa5aeb..818efed 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -53,22 +53,24 @@ HMENU hPopupMenus = 0; */ void set_window_title(HWND dialog) { - char newtitle[256]; + WCHAR newtitle[256]; /* update the window title */ if (current_app) { - char apptitle[256]; - LoadString(GetModuleHandle(NULL), IDS_WINECFG_TITLE_APP, apptitle, 256); - sprintf(newtitle, apptitle, current_app); + WCHAR apptitle[256]; + LoadStringW (GetModuleHandle(NULL), IDS_WINECFG_TITLE_APP, apptitle, + sizeof(apptitle)/sizeof(apptitle[0])); + wsprintfW (newtitle, apptitle, current_app); } else { - LoadString(GetModuleHandle(NULL), IDS_WINECFG_TITLE, newtitle, 256); + LoadStringW (GetModuleHandle(NULL), IDS_WINECFG_TITLE, newtitle, + sizeof(newtitle)/sizeof(newtitle[0])); } - WINE_TRACE("setting title to %s\n", newtitle); - SendMessage(GetParent(dialog), PSM_SETTITLE, 0, (LPARAM) newtitle); + WINE_TRACE("setting title to %s\n", wine_dbgstr_w (newtitle)); + SendMessageW (GetParent(dialog), PSM_SETTITLEW, 0, (LPARAM) newtitle); } @@ -316,6 +318,7 @@ char *get_reg_key(HKEY root, const char if (root != s->root) continue; if (strcasecmp(path, s->path) != 0) continue; + if (!s->name) continue; if (strcasecmp(name, s->name) != 0) continue; WINE_TRACE("found %s:%s in settings list, returning %s\n", path, name, s->value); @@ -584,7 +587,7 @@ void apply(void) /* ================================== utility functions ============================ */ -char *current_app = NULL; /* the app we are currently editing, or NULL if editing global */ +WCHAR* current_app = NULL; /* the app we are currently editing, or NULL if editing global */ /* returns a registry key path suitable for passing to addTransaction */ char *keypath(const char *section) @@ -595,8 +598,8 @@ char *keypath(const char *section) if (current_app) { - result = HeapAlloc(GetProcessHeap(), 0, strlen("AppDefaults\\") + strlen(current_app) + 2 /* \\ */ + strlen(section) + 1 /* terminator */); - sprintf(result, "AppDefaults\\%s", current_app); + result = HeapAlloc(GetProcessHeap(), 0, strlen("AppDefaults\\") + lstrlenW(current_app)*2 + 2 /* \\ */ + strlen(section) + 1 /* terminator */); + wsprintf(result, "AppDefaults\\%ls", current_app); if (section[0]) sprintf( result + strlen(result), "\\%s", section ); } else diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 3cd3d45..e23c7bb 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -38,7 +38,7 @@ #define IS_OPTION_TRUE(ch) \ #define IS_OPTION_FALSE(ch) \ ((ch) == 'n' || (ch) == 'N' || (ch) == 'f' || (ch) == 'F' || (ch) == '0') -extern char *current_app; /* NULL means editing global settings */ +extern WCHAR* current_app; /* NULL means editing global settings */ /* Use get_reg_key and set_reg_key to alter registry settings. The changes made through set_reg_key won't be committed to the registry until process_all_settings is called,
1
0
0
0
Huw Davies : rpcrt4: Add tests for NdrAllocate.
by Alexandre Julliard
17 Aug '06
17 Aug '06
Module: wine Branch: master Commit: d9b6672530d08087e689f1d65205050ff8d29190 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=d9b6672530d08087e689f1d…
Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 16 12:38:20 2006 +0100 rpcrt4: Add tests for NdrAllocate. --- dlls/rpcrt4/tests/ndr_marshall.c | 43 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ca9f5fd..b4184b3 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -901,10 +901,53 @@ #undef TEST_ZERO } +static void test_ndr_allocate(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + void *p1, *p2; + struct tag_mem_list_t + { + DWORD magic; + void *ptr; + struct tag_mem_list_t *next; + } *mem_list; + const DWORD magic_MEML = 'M' << 24 | 'E' << 16 | 'M' << 8 | 'L'; + + StubDesc = Object_StubDesc; + NdrClientInitializeNew(&RpcMessage, &StubMsg, &StubDesc, 0); + + ok(StubMsg.pMemoryList == NULL, "memlist %p\n", StubMsg.pMemoryList); + my_alloc_called = my_free_called = 0; + p1 = NdrAllocate(&StubMsg, 10); + p2 = NdrAllocate(&StubMsg, 20); + ok(my_alloc_called == 2, "alloc called %d\n", my_alloc_called); + mem_list = StubMsg.pMemoryList; +todo_wine { + ok(mem_list != NULL, "mem_list NULL\n"); + } + if(mem_list) + { + ok(mem_list->magic == magic_MEML, "magic %08lx\n", mem_list->magic); + ok(mem_list->ptr == p2, "ptr != p2\n"); + ok(mem_list->next != NULL, "next NULL\n"); + mem_list = mem_list->next; + if(mem_list) + { + ok(mem_list->magic == magic_MEML, "magic %08lx\n", mem_list->magic); + ok(mem_list->ptr == p1, "ptr != p2\n"); + ok(mem_list->next == NULL, "next %p\n", mem_list->next); + } + } + /* NdrFree isn't exported so we can't test free'ing */ +} + START_TEST( ndr_marshall ) { test_simple_types(); test_simple_struct(); test_fullpointer_xlat(); test_client_init(); + test_ndr_allocate(); }
1
0
0
0
Frank Richter : winecfg: New resource strings for appdefaults.
by Alexandre Julliard
16 Aug '06
16 Aug '06
Module: wine Branch: master Commit: 2eaefc342423b68c5ddd4527d6f0ddc488142ae8 URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=2eaefc342423b68c5ddd452…
Author: Frank Richter <frank.richter(a)gmail.com> Date: Wed Aug 16 17:00:27 2006 +0200 winecfg: New resource strings for appdefaults. --- programs/winecfg/Bg.rc | 4 ++++ programs/winecfg/De.rc | 4 ++++ programs/winecfg/En.rc | 4 ++++ programs/winecfg/Es.rc | 15 +++++++++++++++ programs/winecfg/Fi.rc | 4 ++++ programs/winecfg/Fr.rc | 4 ++++ programs/winecfg/Hu.rc | 4 ++++ programs/winecfg/Ja.rc | 15 +++++++++++++++ programs/winecfg/Ko.rc | 4 ++++ programs/winecfg/Nl.rc | 4 ++++ programs/winecfg/No.rc | 4 ++++ programs/winecfg/Ru.rc | 15 +++++++++++++++ programs/winecfg/Tr.rc | 4 ++++ 13 files changed, 85 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 8125694..b363457 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -227,4 +227,8 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "���������, ��������" IDS_DLL_BUILTIN_NATIVE "��������, ���������" IDS_DLL_DISABLED "���������" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" END diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 3a60ebb..0c8fcaa 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -225,4 +225,8 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "Native, Builtin" IDS_DLL_BUILTIN_NATIVE "Builtin, Native" IDS_DLL_DISABLED "ausgeschaltet" + IDS_DEFAULT_SETTINGS "Standardeinstellungen" + IDS_EXECUTABLE_FILTER "Wine-Programme (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Globale Einstellung benutzen" + IDS_SELECT_EXECUTABLE "Ausf�hrbares Programm ausw�hlen" END diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 3884d7b..157d727 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -226,6 +226,10 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "native, builtin" IDS_DLL_BUILTIN_NATIVE "builtin, native" IDS_DLL_DISABLED "disabled" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" END /****************************************************************/ diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 4b67f26..ba3fd92 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -211,3 +211,18 @@ BEGIN IDS_SHELL_FOLDER "Shell Folder" IDS_LINKS_TO "Links to" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DLL_WARNING "Changing the load order of this library is not recommended.\nAre you sure you want to do this?" + IDS_DLL_WARNING_CAPTION "Warning: system library" + IDS_DLL_NATIVE "native" + IDS_DLL_BUILTIN "builtin" + IDS_DLL_NATIVE_BUILTIN "native, builtin" + IDS_DLL_BUILTIN_NATIVE "builtin, native" + IDS_DLL_DISABLED "disabled" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" +END diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index f91de71..3eedd2f 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -224,4 +224,8 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "natiivi, sis�inen" IDS_DLL_BUILTIN_NATIVE "sis�inen, natiivi" IDS_DLL_DISABLED "ei k�yt�ss�" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" END diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 3bba05b..5320311 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -225,4 +225,8 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "native, inclue" IDS_DLL_BUILTIN_NATIVE "inclue, native" IDS_DLL_DISABLED "d�sactiv�e" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" END diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index 57132c8..7b0db4e 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -221,4 +221,8 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "nat�v, be�p�tett" IDS_DLL_BUILTIN_NATIVE "be�p�tett, nat�v" IDS_DLL_DISABLED "letiltva" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" END diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 995cab1..bab5250 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -209,3 +209,18 @@ BEGIN IDS_SHELL_FOLDER "Shell Folder" IDS_LINKS_TO "Links to" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DLL_WARNING "Changing the load order of this library is not recommended.\nAre you sure you want to do this?" + IDS_DLL_WARNING_CAPTION "Warning: system library" + IDS_DLL_NATIVE "native" + IDS_DLL_BUILTIN "builtin" + IDS_DLL_NATIVE_BUILTIN "native, builtin" + IDS_DLL_BUILTIN_NATIVE "builtin, native" + IDS_DLL_DISABLED "disabled" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" +END diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 278adcd..6c4c9a6 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -229,4 +229,8 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "����Ƽ��, ����" IDS_DLL_BUILTIN_NATIVE "����, ����Ƽ��" IDS_DLL_DISABLED "������� ����" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" END diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 0ede049..8cd1fc1 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -226,4 +226,8 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "Native dan builtin" IDS_DLL_BUILTIN_NATIVE "Builtin dan native" IDS_DLL_DISABLED "Uitgeschakeld" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" END diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index c1cd449..7cba3eb 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -224,4 +224,8 @@ END IDS_DLL_NATIVE_BUILTIN "innf�dt, innebygget" IDS_DLL_BUILTIN_NATIVE "innebygget, innf�dt" IDS_DLL_DISABLED "sl�tt av" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" END diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 5a54d40..dae05b7 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -211,3 +211,18 @@ BEGIN IDS_SHELL_FOLDER "����������� �����" IDS_LINKS_TO "������� �" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DLL_WARNING "Changing the load order of this library is not recommended.\nAre you sure you want to do this?" + IDS_DLL_WARNING_CAPTION "Warning: system library" + IDS_DLL_NATIVE "native" + IDS_DLL_BUILTIN "builtin" + IDS_DLL_NATIVE_BUILTIN "native, builtin" + IDS_DLL_BUILTIN_NATIVE "builtin, native" + IDS_DLL_DISABLED "disabled" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" +END diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index fd51ddc..dba3d81 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -224,4 +224,8 @@ IDS_DLL_BUILTIN "yerle�ik" IDS_DLL_NATIVE_BUILTIN "do�al, yerle�ik" IDS_DLL_BUILTIN_NATIVE "yerle�ik, do�al" IDS_DLL_DISABLED "devre d���" + IDS_DEFAULT_SETTINGS "Default Settings" + IDS_EXECUTABLE_FILTER "Wine Programs (*.exe,*.exe.so)\0*.exe;*.exe.so\0" + IDS_USE_GLOBAL_SETTINGS "Use global settings" + IDS_SELECT_EXECUTABLE "Select an executable file" END
1
0
0
0
Jacek Caban : mshtml: Added [Get|Set]ParentContentListener implementation.
by Alexandre Julliard
16 Aug '06
16 Aug '06
Module: wine Branch: master Commit: 90c5baf069a188b2a0e7ab9d7f84cd8a260671fb URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=90c5baf069a188b2a0e7ab9…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 16 16:34:32 2006 +0200 mshtml: Added [Get|Set]ParentContentListener implementation. --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/nsembed.c | 69 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index df1407b..8e956bc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -124,6 +124,8 @@ struct NSContainer { NSContainer *parent; HTMLDocument *doc; + nsIURIContentListener *content_listener; + HWND hwnd; BSCallback *bscallback; /* hack */ diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 39f454d..4fabad7 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -800,7 +800,10 @@ static nsresult NSAPI nsURIContentListen nsIWineURI_Release(wine_uri); - return NS_ERROR_NOT_IMPLEMENTED; + *_retval = FALSE; + return This->content_listener + ? nsIURIContentListener_OnStartURIOpen(This->content_listener, aURI, _retval) + : NS_OK; } static nsresult NSAPI nsURIContentListener_DoContent(nsIURIContentListener *iface, @@ -808,9 +811,14 @@ static nsresult NSAPI nsURIContentListen nsIStreamListener **aContentHandler, PRBool *_retval) { NSContainer *This = NSURICL_THIS(iface); + TRACE("(%p)->(%s %x %p %p %p)\n", This, debugstr_a(aContentType), aIsContentPreferred, aRequest, aContentHandler, _retval); - return NS_ERROR_NOT_IMPLEMENTED; + + return This->content_listener + ? nsIURIContentListener_DoContent(This->content_listener, aContentType, + aIsContentPreferred, aRequest, aContentHandler, _retval) + : NS_ERROR_NOT_IMPLEMENTED; } static nsresult NSAPI nsURIContentListener_IsPreferred(nsIURIContentListener *iface, @@ -822,7 +830,11 @@ static nsresult NSAPI nsURIContentListen /* FIXME: Should we do something here? */ *_retval = TRUE; - return NS_OK; + + return This->content_listener + ? nsIURIContentListener_IsPreferred(This->content_listener, aContentType, + aDesiredContentType, _retval) + : NS_OK; } static nsresult NSAPI nsURIContentListener_CanHandleContent(nsIURIContentListener *iface, @@ -830,41 +842,72 @@ static nsresult NSAPI nsURIContentListen PRBool *_retval) { NSContainer *This = NSURICL_THIS(iface); + TRACE("(%p)->(%s %x %p %p)\n", This, debugstr_a(aContentType), aIsContentPreferred, aDesiredContentType, _retval); - return NS_ERROR_NOT_IMPLEMENTED; + + return This->content_listener + ? nsIURIContentListener_CanHandleContent(This->content_listener, aContentType, + aIsContentPreferred, aDesiredContentType, _retval) + : NS_ERROR_NOT_IMPLEMENTED; } static nsresult NSAPI nsURIContentListener_GetLoadCookie(nsIURIContentListener *iface, nsISupports **aLoadCookie) { NSContainer *This = NSURICL_THIS(iface); + WARN("(%p)->(%p)\n", This, aLoadCookie); - return NS_ERROR_NOT_IMPLEMENTED; + + return This->content_listener + ? nsIURIContentListener_GetLoadCookie(This->content_listener, aLoadCookie) + : NS_ERROR_NOT_IMPLEMENTED; } static nsresult NSAPI nsURIContentListener_SetLoadCookie(nsIURIContentListener *iface, nsISupports *aLoadCookie) { NSContainer *This = NSURICL_THIS(iface); + WARN("(%p)->(%p)\n", This, aLoadCookie); - return NS_ERROR_NOT_IMPLEMENTED; + + return This->content_listener + ? nsIURIContentListener_SetLoadCookie(This->content_listener, aLoadCookie) + : NS_ERROR_NOT_IMPLEMENTED; } static nsresult NSAPI nsURIContentListener_GetParentContentListener(nsIURIContentListener *iface, nsIURIContentListener **aParentContentListener) { NSContainer *This = NSURICL_THIS(iface); - WARN("(%p)->(%p)\n", This, aParentContentListener); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)->(%p)\n", This, aParentContentListener); + + if(This->content_listener) + nsIURIContentListener_AddRef(This->content_listener); + + *aParentContentListener = This->content_listener; + return NS_OK; } static nsresult NSAPI nsURIContentListener_SetParentContentListener(nsIURIContentListener *iface, nsIURIContentListener *aParentContentListener) { NSContainer *This = NSURICL_THIS(iface); - WARN("(%p)->(%p)\n", This, aParentContentListener); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)->(%p)\n", This, aParentContentListener); + + if(aParentContentListener == NSURICL(This)) + return NS_OK; + + if(This->content_listener) + nsIURIContentListener_Release(This->content_listener); + + This->content_listener = aParentContentListener; + if(This->content_listener) + nsIURIContentListener_AddRef(This->content_listener); + + return NS_OK; } #undef NSURICL_THIS @@ -1185,6 +1228,7 @@ NSContainer *NSContainer_Create(HTMLDocu ret->doc = doc; ret->ref = 1; ret->bscallback = NULL; + ret->content_listener = NULL; if(parent) nsIWebBrowserChrome_AddRef(NSWBCHROME(parent)); @@ -1275,6 +1319,11 @@ void NSContainer_Release(NSContainer *Th nsIWebBrowserFocus_Release(This->focus); This->focus = NULL; + if(This->content_listener) { + nsIURIContentListener_Release(This->content_listener); + This->content_listener = NULL; + } + if(This->hwnd) { DestroyWindow(This->hwnd); This->hwnd = NULL;
1
0
0
0
Robert Shearman : advapi32: Add tests for RegQueryValueEx to show that it sets the data
by Alexandre Julliard
16 Aug '06
16 Aug '06
Module: wine Branch: master Commit: bc590e87a6f9c7421ec3386a7c09a63a3e55dead URL:
http://source.winehq.org/git/?p=wine.git;a=commit;h=bc590e87a6f9c7421ec3386…
Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 16 13:00:59 2006 +0100 advapi32: Add tests for RegQueryValueEx to show that it sets the data size to 0 when a buffer isn't present and that it sets the type to REG_NONE on Win9x. --- dlls/advapi32/registry.c | 11 ++++++++++- dlls/advapi32/tests/registry.c | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 81ed484..84ba75e 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1142,7 +1142,11 @@ LONG WINAPI RegQueryValueExW( HKEY hkey, RtlInitUnicodeString( &name_str, name ); if (data) total_size = min( sizeof(buffer), *count + info_size ); - else total_size = info_size; + else + { + total_size = info_size; + if (count) *count = 0; + } status = NtQueryValueKey( hkey, &name_str, KeyValuePartialInformation, buffer, total_size, &total_size ); @@ -1224,6 +1228,11 @@ LONG WINAPI RegQueryValueExA( HKEY hkey, if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + if (!data && count) *count = 0; + + /* this matches Win9x behaviour - NT sets *type to a random value */ + if (type) *type = REG_NONE; + RtlInitAnsiString( &nameA, name ); if ((status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString, &nameA, FALSE ))) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 577838d..3622618 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -333,11 +333,25 @@ static void test_query_value_ex(void) DWORD ret; DWORD size; DWORD type; + BYTE buffer[10]; ret = RegQueryValueExA(hkey_main, "TP1_SZ", NULL, &type, NULL, &size); ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", ret); ok(size == strlen(sTestpath1) + 1, "(%ld,%ld)\n", (DWORD)strlen(sTestpath1) + 1, size); ok(type == REG_SZ, "type %ld is not REG_SZ\n", type); + + type = 0xdeadbeef; + size = 0xdeadbeef; + ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Non Existent Value", NULL, &type, NULL, &size); + ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %ld\n", ret); + ok(size == 0, "size should have been set to 0 instead of %ld\n", size); + ok(type == (DWORD)HKEY_CLASSES_ROOT /* NT */ || type == 0 /* Win9x */, + "type should have been set to 0x80000000 or 0 instead of 0x%lx\n", type); + + size = sizeof(buffer); + ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Non Existent Value", NULL, &type, buffer, &size); + ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %ld\n", ret); + ok(size == sizeof(buffer), "size shouldn't have been changed to %ld\n", size); } static void test_get_value(void)
1
0
0
0
← Newer
1
...
27
28
29
30
31
32
33
...
75
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
73
74
75
Results per page:
10
25
50
100
200