wine-commits August 2006

wine-commits@winehq.org

5 participants
746 discussions

Juan Lang : crypt32: Fix a misplaced parenthesis.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: d0ca58ba365baf31b497112ea984f66155386f42 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0ca58ba365baf31b497112… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Aug 21 17:07:28 2006 -0700 crypt32: Fix a misplaced parenthesis. --- dlls/crypt32/oid.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 7b152c3..c1d3bc6 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -365,8 +365,8 @@ BOOL WINAPI CryptGetOIDFunctionAddress(H { if (HIWORD(pszOID)) { - if (HIWORD(function->entry.pszOID && - !strcasecmp(function->entry.pszOID, pszOID))) + if (HIWORD(function->entry.pszOID) && + !strcasecmp(function->entry.pszOID, pszOID)) { *ppvFuncAddr = function->entry.pvFuncAddr; *phFuncAddr = NULL; /* FIXME: what should it be? */

1 0

Stefan Leichter : oleaut32: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 220547708a3dc214d0779c463a4d03da03536cb4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=220547708a3dc214d0779c4… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Aug 21 20:48:12 2006 +0200 oleaut32: Print 64bit integers with wine_dbgstr_longlong. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 46d31e9..05fb764 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2172,7 +2172,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPAR /* Zero is not a negative number */ bNegative = pNumprs->dwOutFlags & NUMPRS_NEG && ul64 ? TRUE : FALSE; - TRACE("Integer value is %lld, bNeg %d\n", ul64, bNegative); + TRACE("Integer value is 0x%s, bNeg %d\n", wine_dbgstr_longlong(ul64), bNegative); /* For negative integers, try the signed types in size order */ if (!bOverflow && bNegative)

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål resources.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 6a37478ab9e25b8b3ca3f6ccd3d390fcbb4043ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a37478ab9e25b8b3ca3f6c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Aug 21 22:53:57 2006 +0200 winecfg: Update Norwegian Bokmål resources. --- programs/winecfg/No.rc | 68 ++++++++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 519e0e1..b684e63 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -124,9 +124,9 @@ BEGIN GROUPBOX " Stasjonkartlegging ",IDC_STATIC,8,4,244,240 CONTROL "Listevisning",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 - PUSHBUTTON "&Legg til . . .",IDC_BUTTON_ADD,15,98,37,14 - PUSHBUTTON "Fje&rn",IDC_BUTTON_REMOVE,56,98,37,14 - PUSHBUTTON "&Automatisk . . .",IDC_BUTTON_AUTODETECT,197,98,49,14 + PUSHBUTTON "&Legg til . . .",IDC_BUTTON_ADD,15,98,45,14 + PUSHBUTTON "Fje&rn",IDC_BUTTON_REMOVE,63,98,37,14 + PUSHBUTTON "&Automatisk . . .",IDC_BUTTON_AUTODETECT,190,98,56,14 /* editing drive details */ LTEXT "&Sti:",IDC_STATIC,15,123,20,9 @@ -234,46 +234,46 @@ STRINGTABLE DISCARDABLE BEGIN IDS_SHADER_MODE_HARDWARE "Maskinvare" IDS_SHADER_MODE_NONE "Ingen" - IDS_SHADER_MODE_EMULATION "Emulert" + IDS_SHADER_MODE_EMULATION "Emulering" END STRINGTABLE DISCARDABLE BEGIN - IDS_DRIVE_UNKNOWN "Autodetect" - IDS_DRIVE_FIXED "Local hard disk" - IDS_DRIVE_REMOTE "Network share" - IDS_DRIVE_REMOVABLE "Floppy disk" + IDS_DRIVE_UNKNOWN "Automatisk" + IDS_DRIVE_FIXED "Lokal harddisk" + IDS_DRIVE_REMOTE "Nettverksressurs" + IDS_DRIVE_REMOVABLE "Diskett" IDS_DRIVE_CDROM "CD-ROM" - IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26" - IDS_SYSTEM_DRIVE_LABEL "System drive" - IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" - IDS_COL_DRIVELETTER "Letter" - IDS_COL_DRIVEMAPPING "Drive Mapping" - IDS_NO_DRIVE_C "You don't have a drive C. This is not so great.\n\nRemember to click 'Add' in the Drives tab to create one!\n" + IDS_DRIVE_LETTERS_EXCEEDED "Du kan ikke legge til flere stasjoner.\n\nHver stasjon m� ha en bokstav fra A til Z, s� 26 stasjoner er det meste" + IDS_SYSTEM_DRIVE_LABEL "Systemstasjon" + IDS_CONFIRM_DELETE_C "Vil du virkelig fjerne stasjon C?\n\nDe fleste Windows-programmer forventer at C finnes, og lager br�k hvis den ikke er der. Husk � lage den p� nytt hvis du fortsetter." + IDS_COL_DRIVELETTER "Bokstav" + IDS_COL_DRIVEMAPPING "Peker til" + IDS_NO_DRIVE_C "Du har ikke en C-stasjon. Det er ikke s� bra..\n\nHusk � trykke �Legg til� i stasjonsfanen for � lage en.\n" END STRINGTABLE DISCARDABLE BEGIN IDS_ACCEL_FULL "Full" IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basic" - IDS_ACCEL_EMULATION "Emulation" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_ARTS "aRts Driver" - IDS_DRIVER_ESOUND "EsounD Driver" - IDS_DRIVER_OSS "OSS Driver" - IDS_DRIVER_JACK "JACK Driver" - IDS_DRIVER_NAS "NAS Driver" - IDS_DRIVER_AUDIOIO "Audio IO (Solaris) Driver" - IDS_DRIVER_COREAUDIO "CoreAudio Driver" - IDS_OPEN_DRIVER_ERROR "Couldn't open %s!" - IDS_SOUNDDRIVERS "Sound Drivers" - IDS_DEVICES_WAVEOUT "Wave Out Devices" - IDS_DEVICES_WAVEIN "Wave In Devices" - IDS_DEVICES_MIDIOUT "MIDI Out Devices" - IDS_DEVICES_MIDIIN "MIDI In Devices" - IDS_DEVICES_AUX "Aux Devices" - IDS_DEVICES_MIXER "Mixer Devices" - IDS_UNAVAILABLE_DRIVER "Found driver in registry that is not available!\n\nRemove \"%s\" from registry?" - IDS_WARNING "Warning" + IDS_ACCEL_BASIC "Grunnleggende" + IDS_ACCEL_EMULATION "Emulering" + IDS_DRIVER_ALSA "ALSA-driver" + IDS_DRIVER_ARTS "aRts-driver" + IDS_DRIVER_ESOUND "EsounD-driver" + IDS_DRIVER_OSS "OSS-driver" + IDS_DRIVER_JACK "JACK-driver" + IDS_DRIVER_NAS "NAS-driver" + IDS_DRIVER_AUDIOIO "Audio IO (Solaris)-driver" + IDS_DRIVER_COREAUDIO "CoreAudio-driver" + IDS_OPEN_DRIVER_ERROR "Klarte ikke �pne %s." + IDS_SOUNDDRIVERS "Lyddrivere" + IDS_DEVICES_WAVEOUT "Lyd ut-enheter" + IDS_DEVICES_WAVEIN "Lyd inn-enheter" + IDS_DEVICES_MIDIOUT "MIDI ut-enheter" + IDS_DEVICES_MIDIIN "MIDI inn-enheter" + IDS_DEVICES_AUX "Aux-enheter" + IDS_DEVICES_MIXER "Mikserenheter" + IDS_UNAVAILABLE_DRIVER "Fant driver i registeret som ikke er tilgjengelig.\n\nFjerne �%s� fra registeret?" + IDS_WARNING "Advarsel" END

1 0

Fatih Aşıcı : winecfg: Update Turkish resources.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 2367e377747085c3747c9d350b2078f4cbe16efb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2367e377747085c3747c9d3… Author: Fatih Aşıcı <fatih.asici(a)gmail.com> Date: Mon Aug 21 22:40:47 2006 +0300 winecfg: Update Turkish resources. --- programs/winecfg/Tr.rc | 76 ++++++++++++++++++++++++------------------------ 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index 252b867..f7b772a 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -64,7 +64,7 @@ BEGIN 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.", + 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 taklit 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 @@ -121,7 +121,7 @@ IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " S�r�c� haritalama ",IDC_STATIC,8,4,244,240 + GROUPBOX " S�r�c� E�le�tirmesi ",IDC_STATIC,8,4,244,240 CONTROL "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 PUSHBUTTON "&Ekle...",IDC_BUTTON_ADD,15,98,37,14 @@ -169,7 +169,7 @@ BEGIN COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "�rnek Ba��na Bit Say�s�:",IDC_STATIC,137,232,80,8 COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "S�r�c� Em�lasyonu",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 + CONTROL "S�r�c� Taklidi",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 @@ -232,48 +232,48 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_SHADER_MODE_HARDWARE "Hardware" - IDS_SHADER_MODE_NONE "None" - IDS_SHADER_MODE_EMULATION "Emulated" + IDS_SHADER_MODE_HARDWARE "Donan�m" + IDS_SHADER_MODE_NONE "Hi�biri" + IDS_SHADER_MODE_EMULATION "Taklit" END STRINGTABLE DISCARDABLE BEGIN - IDS_DRIVE_UNKNOWN "Autodetect" - IDS_DRIVE_FIXED "Local hard disk" - IDS_DRIVE_REMOTE "Network share" - IDS_DRIVE_REMOVABLE "Floppy disk" + IDS_DRIVE_UNKNOWN "Otomatik Alg�la" + IDS_DRIVE_FIXED "Yerel sabit disk" + IDS_DRIVE_REMOTE "A� payla��m�" + IDS_DRIVE_REMOVABLE "Disket s�r�c�" IDS_DRIVE_CDROM "CD-ROM" - IDS_DRIVE_LETTERS_EXCEEDED "You cannot add any more drives.\n\nEach drive must have a letter, from A to Z, so you cannot have more than 26" - IDS_SYSTEM_DRIVE_LABEL "System drive" - IDS_CONFIRM_DELETE_C "Are you sure you want to delete drive C?\n\nMost Windows applications expect drive C to exist, and will die messily if it doesn't. If you proceed remember to recreate it!" - IDS_COL_DRIVELETTER "Letter" - IDS_COL_DRIVEMAPPING "Drive Mapping" - IDS_NO_DRIVE_C "You don't have a drive C. This is not so great.\n\nRemember to click 'Add' in the Drives tab to create one!\n" + IDS_DRIVE_LETTERS_EXCEEDED "Daha fazla s�r�c� ekleyemezsiniz.\n\nHer s�r�c�n�n A-Z aral��nda bir harfi olmal�d�r. Dolay�s�yla 26'dan fazla tan�mlayamazs�n�z." + IDS_SYSTEM_DRIVE_LABEL "Sistem s�r�c�s�" + IDS_CONFIRM_DELETE_C "C s�r�c�s�n� silmek istedi�inizden emin misiniz?\n\n�o�u Windows uygulamas� C s�r�c�s�n�n var olmas�n� bekler ve yoksa istenmeyen bir �ekilde sonlan�r. E�er devam ederseniz, daha sonra yeniden olu�turmay� unutmay�n!" + IDS_COL_DRIVELETTER "Harf" + IDS_COL_DRIVEMAPPING "S�r�c� E�leme" + IDS_NO_DRIVE_C "C s�r�c�n�z yok. Bu beklenen bir durum de�il.\n\nBir tane olu�turmak i�in S�r�c�ler sekmesinden Ekle'yi t�klamay� unutmay�n!\n" END STRINGTABLE DISCARDABLE BEGIN - IDS_ACCEL_FULL "Full" - IDS_ACCEL_STANDARD "Standard" - IDS_ACCEL_BASIC "Basic" - IDS_ACCEL_EMULATION "Emulation" - IDS_DRIVER_ALSA "ALSA Driver" - IDS_DRIVER_ARTS "aRts Driver" - IDS_DRIVER_ESOUND "EsounD Driver" - IDS_DRIVER_OSS "OSS Driver" - IDS_DRIVER_JACK "JACK Driver" - IDS_DRIVER_NAS "NAS Driver" - IDS_DRIVER_AUDIOIO "Audio IO (Solaris) Driver" - IDS_DRIVER_COREAUDIO "CoreAudio Driver" - IDS_OPEN_DRIVER_ERROR "Couldn't open %s!" - IDS_SOUNDDRIVERS "Sound Drivers" - IDS_DEVICES_WAVEOUT "Wave Out Devices" - IDS_DEVICES_WAVEIN "Wave In Devices" - IDS_DEVICES_MIDIOUT "MIDI Out Devices" - IDS_DEVICES_MIDIIN "MIDI In Devices" - IDS_DEVICES_AUX "Aux Devices" - IDS_DEVICES_MIXER "Mixer Devices" - IDS_UNAVAILABLE_DRIVER "Found driver in registry that is not available!\n\nRemove \"%s\" from registry?" - IDS_WARNING "Warning" + IDS_ACCEL_FULL "Tam" + IDS_ACCEL_STANDARD "Standart" + IDS_ACCEL_BASIC "Temel" + IDS_ACCEL_EMULATION "Taklit" + IDS_DRIVER_ALSA "ALSA S�r�c�s�" + IDS_DRIVER_ARTS "aRts S�r�c�s�" + IDS_DRIVER_ESOUND "EsounD S�r�c�s�" + IDS_DRIVER_OSS "OSS S�r�c�s�" + IDS_DRIVER_JACK "JACK S�r�c�s�" + IDS_DRIVER_NAS "NAS S�r�c�s�" + IDS_DRIVER_AUDIOIO "Audio IO (Solaris) S�r�c�s�" + IDS_DRIVER_COREAUDIO "CoreAudio S�r�c�s�" + IDS_OPEN_DRIVER_ERROR "%s a��lamad�!" + IDS_SOUNDDRIVERS "Ses S�r�c�leri" + IDS_DEVICES_WAVEOUT "Dalga ��k�� Ayg�tlar�" + IDS_DEVICES_WAVEIN "Dalga Giri� Ayg�tlar�" + IDS_DEVICES_MIDIOUT "MIDI ��k�� Ayg�tlar�" + IDS_DEVICES_MIDIIN "MIDI Giri� Ayg�tlar�" + IDS_DEVICES_AUX "Aux Ayg�tlar�" + IDS_DEVICES_MIXER "Mixer Ayg�tlar�" + IDS_UNAVAILABLE_DRIVER "Sistem kayd�nda kullan�labilir olmayan bir s�r�c� bulundu!\n\n\"%s\" giri�i sistem kayd�ndan silinsin mi?" + IDS_WARNING "Uyar�" END

1 0

Matthew Finnicum : riched20: Make EM_EXLINEFROMCHAR handle special case of lParam == -1.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 9b47add3bf430637715ffc0fdc0cfffb84433eaa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b47add3bf430637715ffc0… Author: Matthew Finnicum <MattFinn(a)gmail.com> Date: Mon Aug 21 07:25:51 2006 -0500 riched20: Make EM_EXLINEFROMCHAR handle special case of lParam == -1. --- dlls/riched20/editor.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 95d11dc..02358d3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2151,7 +2151,10 @@ LRESULT WINAPI RichEditANSIWndProc(HWND } case EM_EXLINEFROMCHAR: { - return ME_RowNumberFromCharOfs(editor, lParam); + if (lParam == -1) + return ME_RowNumberFromCharOfs(editor, ME_GetCursorOfs(editor,1)); + else + return ME_RowNumberFromCharOfs(editor, lParam); } case EM_LINEINDEX: {

1 0

Piotr Caban : oleview: Added dispinterface handling to idl viewer.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 52d16ff54d7fe87a6a52182f0b822b917393926c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52d16ff54d7fe87a6a52182… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 21 22:21:09 2006 +0200 oleview: Added dispinterface handling to idl viewer. --- programs/oleview/main.h | 2 programs/oleview/typelib.c | 199 +++++++++++++++++++++++++++++++++----------- 2 files changed, 153 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=52d16ff54d7fe87a6a5…

1 0

Piotr Caban : oleview: Added typedef handling to idl viewer.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: f7eeac6fc19a97e967295621396814467f7d27c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f7eeac6fc19a97e96729562… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 21 11:36:35 2006 +0200 oleview: Added typedef handling to idl viewer. --- programs/oleview/typelib.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index c5088d3..52a500e 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -755,6 +755,49 @@ #define ENUM_FLAGS(x) if(pTypeAttr->wTyp AddToStrW(pTLData->wszInsertAfter, wszNewLine); } +void CreateTypedefHeader(ITypeInfo *pTypeInfo, + TYPEATTR *pTypeAttr, TYPELIB_DATA *pTLData) +{ + BOOL bFirst = TRUE; + WCHAR wszGuid[MAX_LOAD_STRING]; + const WCHAR wszTypedef[] = { 't','y','p','e','d','e','f',' ','\0' }; + const WCHAR wszPublic[] = { 'p','u','b','l','i','c','\0' }; + + AddToTLDataStrW(pTLData, wszTypedef); + if(memcmp(&pTypeAttr->guid, &GUID_NULL, sizeof(GUID))) + { + if(bFirst) AddToTLDataStrW(pTLData, wszOpenBrackets1); + else + { + AddToTLDataStrW(pTLData, wszComa); + AddToTLDataStrW(pTLData, wszSpace); + } + bFirst = FALSE; + AddToTLDataStrW(pTLData, wszUUID); + AddToTLDataStrW(pTLData, wszOpenBrackets2); + StringFromGUID2(&(pTypeAttr->guid), wszGuid, MAX_LOAD_STRING); + wszGuid[lstrlenW(wszGuid)-1] = '\0'; + AddToTLDataStrW(pTLData, &wszGuid[1]); + AddToTLDataStrW(pTLData, wszCloseBrackets2); + } + if(pTypeAttr->typekind == TKIND_ALIAS) + { + if(bFirst) AddToTLDataStrW(pTLData, wszOpenBrackets1); + else + { + AddToTLDataStrW(pTLData, wszComa); + AddToTLDataStrW(pTLData, wszSpace); + } + bFirst = FALSE; + AddToTLDataStrW(pTLData, wszPublic); + } + if(!bFirst) + { + AddToTLDataStrW(pTLData, wszCloseBrackets1); + AddToTLDataStrW(pTLData, wszNewLine); + } +} + int PopulateTree(void) { TVINSERTSTRUCT tvis; @@ -883,6 +926,23 @@ int PopulateTree(void) case TKIND_ENUM: AddToStrW(wszText, wszTKIND_ENUM); AddToStrW(wszText, bstrName); + + CreateTypedefHeader(pTypeInfo, pTypeAttr, + (TYPELIB_DATA*)(U(tvis).item.lParam)); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), + &wszTKIND_ENUM[lstrlenW(wszTKIND_ALIAS)]); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszOpenBrackets3); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam),wszNewLine); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, + wszCloseBrackets3); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, + wszSpace); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, + bstrName); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, + wszSemicolon); + AddToStrW(((TYPELIB_DATA*)(U(tvis).item.lParam))->wszInsertAfter, + wszNewLine); break; case TKIND_RECORD: AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszTKIND_RECORD); @@ -961,6 +1021,13 @@ int PopulateTree(void) AddToStrW(wszText, wszSpace); AddToStrW(wszText, bstrName); AddToStrW(wszText, wszAfter); + + CreateTypedefHeader(pTypeInfo, pTypeAttr, + (TYPELIB_DATA*)(U(tvis).item.lParam)); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), + &wszText[lstrlenW(wszTKIND_ALIAS)]); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszSemicolon); + AddToTLDataStrW((TYPELIB_DATA*)(U(tvis).item.lParam), wszNewLine); break; default: lstrcpyW(wszText, bstrName);

1 0

appdb/include maintainer.php
by WineHQ 21 Aug '06

21 Aug '06

ChangeSet ID: 27544 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/08/21 13:57:44 Modified files: include : maintainer.php Log message: EA Durbin" <ead1234(a)hotmail.com> Include 'version.php' and 'application.php' in maintainer.php as we new version and application objects in this class. Fixes bug 5981. Patch: http://cvs.winehq.org/patch.py?id=27544 Old revision New revision Changes Path 1.15 1.16 +2 -0 appdb/include/maintainer.php Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.15 appdb/include/maintainer.php:1.16 --- appdb/include/maintainer.php:1.15 21 Aug 2006 18:57:44 -0000 +++ appdb/include/maintainer.php 21 Aug 2006 18:57:44 -0000 @@ -2,6 +2,8 @@ /*****************************/ /* functions for maintainers */ /*****************************/ +require_once(BASE."include/application.php"); +require_once(BASE."include/version.php"); class maintainer {

1 0

Huw Davies : winex11.drv: Fix rendering of fonts that don' t support anti-aliasing.
by Alexandre Julliard 21 Aug '06

21 Aug '06

Module: wine Branch: master Commit: 0bd611ceadf46c4e3fd5694443cc237faf92993c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0bd611ceadf46c4e3fd5694… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 21 10:50:59 2006 +0100 winex11.drv: Fix rendering of fonts that don't support anti-aliasing. --- dlls/winex11.drv/xrender.c | 62 +++++++++++++++++++++++--------------------- 1 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index de12029..1f40b9b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -632,6 +632,36 @@ static BOOL UploadGlyph(X11DRV_PDEVICE * UINT ggo_format = GGO_GLYPH_INDEX; XRenderPictFormat pf; + switch(format) { + case AA_Grey: + ggo_format |= WINE_GGO_GRAY16_BITMAP; + break; + + default: + ERR("aa = %d - not implemented\n", format); + case AA_None: + ggo_format |= GGO_BITMAP; + break; + } + + buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, + NULL); + if(buflen == GDI_ERROR) { + if(format != AA_None) { + format = AA_None; + entry->aa_default = AA_None; + ggo_format &= ~WINE_GGO_GRAY16_BITMAP; + ggo_format |= GGO_BITMAP; + buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, + NULL); + } + if(buflen == GDI_ERROR) { + ERR("GetGlyphOutlineW failed\n"); + return FALSE; + } + TRACE("Turning off antialiasing for this monochrome font\n"); + } + /* If there is nothing for the current type, we create the entry. */ if( !entry->format[format] ) { entry->format[format] = HeapAlloc(GetProcessHeap(), @@ -676,35 +706,6 @@ static BOOL UploadGlyph(X11DRV_PDEVICE * } } - switch(format) { - case AA_Grey: - ggo_format |= WINE_GGO_GRAY16_BITMAP; - break; - - default: - ERR("aa = %d - not implemented\n", format); - case AA_None: - ggo_format |= GGO_BITMAP; - break; - } - - buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, - NULL); - if(buflen == GDI_ERROR) { - if(format != AA_None) { - format = AA_None; - entry->aa_default = AA_None; - ggo_format &= ~WINE_GGO_GRAY16_BITMAP; - ggo_format |= GGO_BITMAP; - buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, - NULL); - } - if(buflen == GDI_ERROR) { - ERR("GetGlyphOutlineW failed\n"); - return FALSE; - } - TRACE("Turning off antialiasing for this monochrome font\n"); - } if(formatEntry->glyphset == 0 && X11DRV_XRender_Installed) { switch(format) { @@ -1250,6 +1251,9 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_P for(idx = 0; idx < count; idx++) { if( !formatEntry ) { UploadGlyph(physDev, wstr[idx], antialias); + /* re-evaluate antialias since aa_default may have changed */ + if( disable_antialias == FALSE ) + antialias = entry->aa_default; formatEntry = entry->format[antialias]; } else if( wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) { UploadGlyph(physDev, wstr[idx], antialias);

1 0

Frank Richter : winecfg: audio: Use strings from resources.
by Alexandre Julliard 21 Aug '06

21 Aug '06

Module: wine Branch: master Commit: 3713f49dfad58d9e118c739968b96642d241593d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3713f49dfad58d9e118c739… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sat Aug 19 05:19:57 2006 +0200 winecfg: audio: Use strings from resources. --- programs/winecfg/Bg.rc | 26 ++++++ programs/winecfg/De.rc | 26 ++++++ programs/winecfg/En.rc | 26 ++++++ programs/winecfg/Es.rc | 26 ++++++ programs/winecfg/Fi.rc | 26 ++++++ programs/winecfg/Fr.rc | 26 ++++++ programs/winecfg/Hu.rc | 26 ++++++ programs/winecfg/Ja.rc | 26 ++++++ programs/winecfg/Ko.rc | 26 ++++++ programs/winecfg/Nl.rc | 26 ++++++ programs/winecfg/No.rc | 26 ++++++ programs/winecfg/Ru.rc | 26 ++++++ programs/winecfg/Tr.rc | 26 ++++++ programs/winecfg/audio.c | 190 +++++++++++++++++++++++------------------ programs/winecfg/properties.h | 2 programs/winecfg/resource.h | 22 +++++ 16 files changed, 467 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3713f49dfad58d9e118…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2006