March 2006 - wine-commits

Juan Lang : crypt32: Move context properties to a separate file.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 91b80fc8e2ab6684351f220e22f1c19a80a14b49 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91b80fc8e2ab6684351f220… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Mar 9 19:06:42 2006 -0800 crypt32: Move context properties to a separate file. --- dlls/crypt32/Makefile.in | 1 dlls/crypt32/crypt32_private.h | 27 ++++ dlls/crypt32/proplist.c | 215 ++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 242 ++++++---------------------------------- 4 files changed, 279 insertions(+), 206 deletions(-) create mode 100644 dlls/crypt32/proplist.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=91b80fc8e2ab6684351…

1 0

Robert Reif : wineesd: Update ESD driver to closer match OSS and ALSA drivers.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 2eca872675374eaeea5f418d111324d50f3547ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2eca872675374eaeea5f418… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Mar 9 23:07:26 2006 -0500 wineesd: Update ESD driver to closer match OSS and ALSA drivers. --- dlls/winmm/wineesd/audio.c | 342 ++++++++++++++++++++------------------------ 1 files changed, 154 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2eca872675374eaeea5…

1 0

Petr Tesarik : winedbg: Fix lcall instruction opcode.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 315c4e78cb847edb7f0da873748a773c3ff81088 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=315c4e78cb847edb7f0da87… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Fri Mar 10 10:55:07 2006 +0100 winedbg: Fix lcall instruction opcode. --- programs/winedbg/be_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 1dc001d..3f0fb6a 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -331,7 +331,7 @@ static unsigned be_i386_is_func_call(con ch &= 0x38; if (ch != 0x10 && ch != 0x18) return FALSE; /* fall through */ - case 0x9c: + case 0x9a: case 0xCD: WINE_FIXME("Unsupported yet call insn (0x%02x) at %p\n", ch, insn); /* fall through */

1 0

Robert Shearman : wininet: Don't duplicate empty strings.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: ef20936c53b5d593e32b11465e92291e8afae19c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef20936c53b5d593e32b114… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Mar 10 12:28:52 2006 +0000 wininet: Don't duplicate empty strings. --- dlls/wininet/http.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 156bc64..1a2638c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2113,7 +2113,9 @@ static BOOL HTTP_HandleRedirect(LPWININE HeapFree(GetProcessHeap(), 0, lpwhs->lpszUserName); - lpwhs->lpszUserName = WININET_strdupW(userName); + lpwhs->lpszUserName = NULL; + if (userName[0]) + lpwhs->lpszUserName = WININET_strdupW(userName); lpwhs->nServerPort = urlComponents.nPort; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, @@ -2445,12 +2447,12 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW if(hIC->lpszProxyBypass) FIXME("Proxy bypass is ignored.\n"); } - if (NULL != lpszServerName) + if (lpszServerName && lpszServerName[0]) { lpwhs->lpszServerName = WININET_strdupW(lpszServerName); lpwhs->lpszHostName = WININET_strdupW(lpszServerName); } - if (NULL != lpszUserName) + if (lpszUserName && lpszUserName[0]) lpwhs->lpszUserName = WININET_strdupW(lpszUserName); lpwhs->nServerPort = nServerPort; lpwhs->nHostPort = nServerPort;

1 0

Fatih Asici : wordpad: Add Turkish resource file.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 487637b32f65f1b92ea7cae9fa4d5b8a423e6017 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=487637b32f65f1b92ea7cae… Author: Fatih Asici <fasici(a)linux-sevenler.org> Date: Fri Mar 10 17:19:25 2006 +0200 wordpad: Add Turkish resource file. --- programs/wordpad/Tr.rc | 68 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 1 + 2 files changed, 69 insertions(+), 0 deletions(-) create mode 100644 programs/wordpad/Tr.rc diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc new file mode 100644 index 0000000..fda79ec --- /dev/null +++ b/programs/wordpad/Tr.rc @@ -0,0 +1,68 @@ +/* + * Turkish Resources for Wordpad + * + * Copyright 2006 Fatih A��c� <fasici(a)linux-sevenler.org> + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Dosya" + BEGIN + MENUITEM "&Yeni", ID_FILE_NEW + MENUITEM "&A�", ID_FILE_OPEN + MENUITEM "&Kaydet", ID_FILE_SAVE + MENUITEM SEPARATOR + MENUITEM "&��k", ID_FILE_EXIT + END + POPUP "&D�zen" + BEGIN + MENUITEM "&Geri Al\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Yinele\tCtrl+Y", ID_EDIT_REDO + MENUITEM "&T�m�n� se�\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "Ke&s\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Kopyala\tCtrl+C", ID_EDIT_COPY + MENUITEM SEPARATOR + MENUITEM "Salt-&okunur", ID_EDIT_READONLY + MENUITEM "&De�i�mi�", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "D&i�erleri" + BEGIN + MENUITEM "Se�im &bilgisi", ID_EDIT_SELECTIONINFO + MENUITEM "Karakter bi&�imi", ID_EDIT_CHARFORMAT + MENUITEM "&�ntan�ml� kar. bi�imi", ID_EDIT_DEFCHARFORMAT + MENUITEM "Paragra&f bi�imi", ID_EDIT_PARAFORMAT + MENUITEM "&Metni al", ID_EDIT_GETTEXT + END + END + POPUP "&Bi�im" + BEGIN + POPUP "&Arkaplan" + BEGIN + MENUITEM "S&istem\tCtrl+1", ID_BACK_1 + MENUITEM "&Sar�mt�rak\tCtrl+2", ID_BACK_2 + END + POPUP "&Hizalama" + BEGIN + MENUITEM "S&ol\tCtrl+L", ID_ALIGN_LEFT + MENUITEM "O&rta\tCtrl+E", ID_ALIGN_CENTER + MENUITEM "S&a�\tCtrl+R", ID_ALIGN_RIGHT + END + END +END diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index e1c5e68..67c2661 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -83,3 +83,4 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" #include "Nl.rc" #include "No.rc" #include "Ru.rc" +#include "Tr.rc"

1 0

Fatih Asici : winecfg: Update Turkish resource file.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 7afc874b5d22ac091c8b96d6662adfdac1611775 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7afc874b5d22ac091c8b96d… Author: Fatih Asici <fasici(a)linux-sevenler.org> Date: Fri Mar 10 16:36:14 2006 +0200 winecfg: Update Turkish resource file. --- programs/winecfg/Tr.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index 1c16ebb..2e30dd4 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -172,7 +172,7 @@ IDD_DESKTOP_INTEGRATION DIALOG DISCARDAB STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + GROUPBOX " G�r�n�m ",IDC_STATIC,8,4,244,106 LTEXT "Tema:",IDC_STATIC,15,16,230,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Tema kur...",IDC_THEME_INSTALL,152,38,93,14 @@ -180,12 +180,12 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Boyut:",IDC_THEME_SIZETEXT,15,80,230,8 COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + GROUPBOX " �zel Klas�rler ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "Hedef dizin:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "G�zat",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -199,14 +199,14 @@ BEGIN IDS_SHOW_ADVANCED "Geli�mi� Ayarlar" IDS_NOTHEME "(Tema Yok)" IDS_TAB_GRAPHICS "Grafik" - IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" + IDS_TAB_DESKTOP_INTEGRATION "Masa�st� Entegrasyonu" IDS_TAB_AUDIO "Ses" IDS_TAB_ABOUT "Hakk�nda" IDS_WINECFG_TITLE "Wine yap�land�rmas�" - IDS_WINECFG_TITLE_APP "Wine configuration for %s" + IDS_WINECFG_TITLE_APP "%s i�in Wine yap�land�rmas�" IDS_THEMEFILE "Tema dosyalar�" IDS_THEMEFILE_SELECT "Tema dosyas� se�in" IDS_AUDIO_MISSING "Sistem kayd�nda belirlenmi� bir ses s�r�c�s� yok.\n\n�nerilen bir s�r�c� sizin i�in se�ildi.\nBu s�r�c�y� kullanabilir veya varsa ba�ka bir s�r�c�y� se�ebilirsiniz.\n\nSe�imin etkili olabilmesi i�in Uygula'y� t�klamal�s�n�z." - IDS_SHELL_FOLDER "Shell Folder" - IDS_LINKS_TO "Links to" + IDS_SHELL_FOLDER "Klas�r" + IDS_LINKS_TO "Hedef Dizin" END

1 0

Fatih Aşıcı : documentation: Turkish translation of README file.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 46ffe32c9226ef195fa180d62e3f11ccd61ffb4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46ffe32c9226ef195fa180d… Author: Fatih Aşıcı <fasici(a)linux-sevenler.org> Date: Thu Mar 9 12:40:32 2006 +0200 documentation: Turkish translation of README file. --- documentation/README.tr | 219 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 219 insertions(+), 0 deletions(-) create mode 100644 documentation/README.tr diff --git a/documentation/README.tr b/documentation/README.tr new file mode 100644 index 0000000..6f399f5 --- /dev/null +++ b/documentation/README.tr @@ -0,0 +1,219 @@ +1. GİRİŞ + +Wine Microsoft Windows programlarını (DOS, Windows 3.x ve Win32 +uygulamaları dahil) Unix üzerinde çalıştırmanıza izin veren bir +programdır. Microsoft Windows ikili dosyalarını yükleyip çalıştıran +bir program yükleyici ve Windows API çağrılarını Unix ve X11 +eş değerlerini kullanarak gerçekleyen (Winelib isimli) bir kitaplıktan +oluşur. Kitaplık ayrıca Win32 kodlarını doğal Unix çalışabilir +dosyalarına çevirmek için kullanılabilir. + +Wine, GNU LGPL altında dağıtılan özgür bir yazılımdır; ayrıntılar için +LICENSE dosyasına bakabilirsiniz. + +2. HIZLI BAŞLANGIÇ + +Eğer kaynaktan derlemek istiyorsanız, Wine'ı derlemek ve kurmak için +Wine Kur'u kullanmanız önerilir. Wine kaynak kodu içerisinde (README +dosyasını içeren) en üst dizine geçin ve aşağıdaki komutu verin: + +./tools/wineinstall + +Programları "wine [seçenekler] program" şeklinde çalıştırabilirsiniz. +Daha ayrıntılı bilgi ve sorun çözümü için, bu dosyanın geri kalanını, +Wine kılavuz sayfalarını ve özellikle http://www.winehq.org sitesindeki +zengin bilgi arşivini okuyabilirsiniz. + +3. GEREKSİNİMLER + +Wine'ı derlemek ve çalıştırmak için, aşağıdakilerden en az birine sahip +olmanız gerekir: + + Linux sürüm 2.0.36 veya üzeri + FreeBSD 5.3 veya sonrası + Solaris x86 2.5 veya sonrası + NetBSD-current + +Wine çalışmak için çekirdek düzeyinde evre desteğine ihtiyaç duyduğundan +sadece yukarıda söz edilen işletim sistemleri desteklenmektedir. +Çekirdek düzeyi evrelerini destekleyen diğer işletim sistemleri de +gelecekte desteklenebilir. + +Linux hakkında bilgi: + Linux 2.2.x hala çalışması gerekirken Linux 2.0.x de hala çalışabilir + (çok eski 2.0.x sürümlerinde evre ile ilgili çökmeler yaşanmaktadır), + 2.4.x gibi yeni bir çekirdek kullanmak en iyisidir. + +FreeBSD hakkında bilgi: + Wine FreeBSD 4.x ve FreeBSD 5.x üzerinde derlenmesi gerekirken + FreeBSD 5.3 öncesi sürümler büyük olasılıkla düzgün çalışmayacaktır. + + Ayrıntılı bilgi aşağıdaki adreste yer alan FreeBSD uyarlama ağacında + bulunabilir: + <ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/>. + +Solaris hakkında bilgi: + Wine'ı derlemek için muhtemelen GNU araçlarına (gcc, gas, vb.) ihtiyaç + duyacaksınız. Uyarı: gas kurmuş olmak onun gcc tarafından kullanılacağını + temin etmez. gas kurduktan sonra yeniden gcc derlemeniz veya cc, as ve ld + sembolik bağlantılarını gnu araçlarına ayarlamanız gerekmektedir. + +NetBSD hakkında bilgi: + USER_LDT, SYSVSHM, SYSVSEM ve SYSVMSG seçeneklerinin çekirdeğinizde etkin + olduğundan emin olunuz. + + + +Desteklenen dosya sistemleri: + Wine birçok dosya sisteminde çalışabilir. Bununla beraber, Wine /tmp + dizini için umsdos kullanıldığında hata verecektir. Samba üzerinden + yapılan dosya erişimlerinde de birkaç uyumluluk sorunu raporlanmıştır. + Ayrıca, NTFS şu an sadece okuma kipinde güvenli bir şekilde kullanılabildiği + için NTFS kullanmamanızı öneririz. Windows programları, çalışmak için + neredeyse her zaman yazma erişimine gereksinim duyarlar. NTFS dosyaları + ile çalışmak zorunda kaldığınızda, dosyaları yazılabilir bir konuma + kopyalayabilirsiniz. + +Temel gereksinimler: + X11 geliştirme dosyalarının kurulu olması gerekir + (Debian'da xlib6g-dev, Red Hat'da XFree86-devel adlı paketler). + +Derleme aracı gereksinimleri: + x86 sistemlerinde gcc >= 2.7.2 gereklidir. + 2.7.2.3 öncesi sürümlerde bazı dosyaların en iyilemeli derlenmesinde, + daha çok başlık dosyası yönetimi ile ilgili sorunlardan dolayı hata + oluşmaktadır. pgcc şu an Wine ile çalışmamaktadır. Bu sorunun nedeni + bilinmemektedir. + + Elbette "make" aracına da (genellikle GNU make) gereksinim duyacaksınız. + + Ayrıca flex 2.5 sürümü ve sonrası ile birlikte bison gereklidir. + +Seçeneğe bağlı destek kitaplıkları: + Eğer CUPS yazdırma desteği isterseniz, hem cups hem de cups-devel paketlerini + kurmalısınız. + Tam işlevsel bir msxml gerçeklemesi elde etmek için libxml2 paketini kurunuz. + +4. DERLEME + +Eğer wineinstall kullanmamayı seçtiyseniz, Wine'ı derlemek için aşağıdaki +komutları çalıştırınız: + +./configure +make depend +make + +Bu "wine" programını ve destek kitaplıklarını/ikili dosyalarını derleyecektir. +"wine" programı Windows uygulamalarını yükleyecek ve çalıştıracaktır. +"libwine" ("Winelib") kitaplığı Windows kaynak kodunu Unix altında derlemek +ve bağlamak için kullanılabilir. + +Derleme yapılandırma seçeneklerini görmek için ./configure --help giriniz. + +Yama dosyası kullanarak yeni bir sürüme yükseltmek için önce en üst dizine +(README dosyasının bulunduğu dizin) geçin. Ardından bir "make clean" yapın +ve şu komutla sürümü yamalayın: + + gunzip -c yama-dosyası | patch -p1 + +"yama-dosyası" yama dosyasının adıdır (Wine-yymmdd.diff.gz benzeri). Ardından +yine "./configure" komutunu verin ve "make depend && make" komutunu +çalıştırın. + +5. KURULUM + +Wine düzgün bir şekilde inşa edildiğinde, "make install" komutunu +verebilirsiniz; bu komut wine çalışabilir dosyalarını, kılavuz sayfalarını +ve gerekli birkaç dosyayı kuracaktır. + +Önce, çakışan eski bir wine kurulumunu kaldırmayı unutmayın. Kurmadan +önce "dpkg -r wine" veya "rpm -e wine" veya "pisi rm wine" ya da +"make uninstall" komutlarından birini deneyin. + +Yapılandırma ipuçları için http://www.winehq.org/ adresinde Destek +bölümüne bakınız. + +Eğer paylaşımlı kitaplık hataları alıyorsanız +(ör. "Error while loading shared libraries: libntdll.so"), root olarak +kitaplık yolunu /etc/ld.so.conf dosyasına eklediğinizden ve ldconfig +komutunu verdiğinizden emin olun. + +6. PROGRAMLARIN ÇALIŞTIRILMASI + +Wine'ı çağırırken çalışabilir dosyanın tam yolunu verebilir veya sadece +bir dosya adı belirtebilirsiniz. + +Örneğin: Solitaire çalıştırmak için: + + wine sol (dosyaları konumlandırmak için config + wine sol.exe dosyasındaki Path arama yolunu kullanarak) + + wine c:\\windows\\sol.exe (DOS dosya adı sözdizimi ile) + + wine /usr/windows/sol.exe (Unix dosya adı sözdizimi ile) + + wine sol.exe /parametre1 -parametre2 parametre3 + (programı parametre vererek çağırma) + +Not: komut satırında tam bir dosya adı verildiğinde dosyanın yolu + ayrıca path bilgisine eklenecektir. + +Wine henüz tamamlanmış değildir; bu nedenle bazı programlar çökebilir. Eğer +winedbg'yi documentation/debugger.sgml'de belirtildiği gibi düzgün bir şekilde +kurarsanız, bir hata ayıklayıcı satırına düşeceksiniz. Böylece hatayı keşfedip +sorunu çözebilirsiniz. Bunun yapılışı hakkında daha fazla bilgi için lütfen +documentation/debugger.sgml dosyasını okuyunuz. + +Wine'ın erişimine açtığınız tüm önemli dosyalarınızı yedeklemelisiniz veya +bu dosyaların özel bir Wine kopyalarını tutmalısınız. Çünkü, bazı dosya +bozulmalarını raporlayan kullanıcılar görülmüştür. Explorer'ı çalıştırmayın, +örneğin, eğer düzgün bir yedeğiniz yoksa bazı dizin adlarının değiştirilmesine +veya bozulmasına yol açabilir. Messenger gibi diğer MS uygulamaları da bir +şekilde Explorer'ı çalıştırdıklarından dolayı güvenli değildir. Birtakım +bozulmalar (!$!$!$!$.pfr) kısmen bu adresteki bilgiler kullanılarak +düzeltilebilir: +http://home.nexgo.de/andi.mohr/download/decorrupt_explorer + +7. DAHA FAZLA BİLGİYE ERİŞİM + +WWW: Wine hakkında geniş bilgiyi WineHQ sitesine http://www.winehq.org/ + adresinden ulaşarak edinebilirsiniz : çeşitli Wine kılavuzları, + uygulama veritabanı, hata izleme gibi. Burası muhtemelen en iyi + başlangıç noktasıdır. + +SSS: Wine hakkında sıkça sorulan sorulara buradan ulaşabilirsiniz: + http://www.winehq.org/FAQ + +Usenet: comp.emulators.ms-windows.wine üzerinde wine ile ilgili konularda + tartışabilir ve yardım alabilirsiniz. + +Hatalar: + Hatalarınızı http://bugs.winehq.org adresinden Wine Bugzilla + ile raporlayabilirsiniz. Lütfen bir hata raporlamadan önce + hatanın önceden girilip girilmediğini öğrenmek için bugzilla'da + arama yapınız. Hata raporlarını ayrıca comp.emulators.ms-windows.wine + haber grubuna gönderebilirsiniz. Lütfen hangi bilgilerin gerekli + olduğunu öğrenmek için documentation/bugs.sgml dosyasını okuyunuz. + +IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım + alabilirsiniz. + +CVS: Geçerli Wine geliştirme ağacı CVS üzerinden erişilebilir. + Daha fazla bilgi için http://www.winehq.org/cvs adresine gidiniz. + +E-posta listeleri: + Wine geliştiricileri için birtakım e-posta listeleri bulunmaktadır. + Daha fazla bilgi için http://www.winehq.org/forums adresine gidiniz. + +Eğer bir şey eklemek veya hata düzeltmek istiyorsanız, lütfen sonraki +sürümde içerilmesi için wine-patches(a)winehq.org e-posta listesine bir yama +('diff -u' biçiminde) gönderiniz. + +-- +Alexandre Julliard +julliard(a)winehq.org + +-- +Türkçe çeviri: +Fatih Aşıcı +fasici(a)linux-sevenler.org

1 0

Alexandre Julliard : aclocal.m4: Avoid invalid characters in the cache variable name in WINE_GET_SONAME.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 30de3e8efe9211d6909a15610725cc8da5eeff70 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30de3e8efe9211d6909a156… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 10 21:24:05 2006 +0100 aclocal.m4: Avoid invalid characters in the cache variable name in WINE_GET_SONAME. --- aclocal.m4 | 20 +++++---- configure | 133 ++++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 86 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=30de3e8efe9211d6909…

1 0

docs/fr Makefile.in
by Dimi Paun 10 Mar '06

10 Mar '06

ChangeSet ID: 1142020394484228286965848 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2006/03/10 11:53:14 Modified files: fr : Makefile.in Log message: Francois Gouget <fgouget(a)free.fr> Some 'Wine User Guide' source files have been removed. Old revision New revision Changes Path 1.6 1.7 +0 -3 docs/fr/Makefile.in Index: docs/fr/Makefile.in diff -u -p docs/fr/Makefile.in:1.6 docs/fr/Makefile.in:1.7 --- docs/fr/Makefile.in 10 Mar 2006 19:53:14 -0000 +++ /dev/null 10 Mar 2006 19:53:14 -0000 @@ -10,12 +10,9 @@ MIN_TRANS = 1 WINEUSR_SRCS = \ $(SGMLDIR)/wineusr-bugs.sgml \ $(SGMLDIR)/wineusr-configuring.sgml \ - $(SGMLDIR)/wineusr-fonts.sgml \ $(SGMLDIR)/wineusr-getting.sgml \ $(SGMLDIR)/wineusr-glossary.sgml \ $(SGMLDIR)/wineusr-introduction.sgml \ - $(SGMLDIR)/wineusr-printing.sgml \ - $(SGMLDIR)/wineusr-registry.sgml \ $(SGMLDIR)/wineusr-running.sgml WINELIB_SRCS = \

1 0

Mike McCormack : comdlg32: Use a property for the color dialog' s information.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: f66c8e32326abad674733b14cdbaef8010e068a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f66c8e32326abad674733b1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 10 00:45:16 2006 +0900 comdlg32: Use a property for the color dialog's information. --- dlls/commdlg/colordlg.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c index 10cf04f..022e83f 100644 --- a/dlls/commdlg/colordlg.c +++ b/dlls/commdlg/colordlg.c @@ -62,6 +62,9 @@ static const COLORREF predefcolors[6][8] 0x00808040L, 0x00C0C0C0L, 0x00400040L, 0x00FFFFFFL }, }; +static const WCHAR szColourDialogProp[] = { + 'c','o','l','o','u','r','d','i','a','l','o','g','p','r','o','p',0 }; + /* Chose Color PRIVATE Structure: * * This structure is duplicated in the 16 bit code with @@ -461,7 +464,7 @@ void CC_PaintTriangle( HWND hDlg, int y) int oben; RECT rect; HWND hwnd = GetDlgItem(hDlg, 0x2be); - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW( hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6))) /* if full size */ { @@ -499,7 +502,7 @@ void CC_PaintCross( HWND hDlg, int x, in HDC hDC; int w = GetDialogBaseUnits(); HWND hwnd = GetDlgItem(hDlg, 0x2c6); - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW( hDlg, DWLP_USER ); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); RECT rect; POINT point, p; HPEN hPen; @@ -544,7 +547,7 @@ static void CC_PrepareColorGraph( HWND h { int sdif, hdif, xdif, ydif, r, g, b, hue, sat; HWND hwnd = GetDlgItem(hDlg, 0x2c6); - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); HBRUSH hbrush; HDC hdc ; RECT rect, client; @@ -587,7 +590,7 @@ static void CC_PrepareColorGraph( HWND h static void CC_PaintColorGraph( HWND hDlg ) { HWND hwnd = GetDlgItem( hDlg, 0x2c6 ); - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); HDC hDC; RECT rect; if (IsWindowVisible(hwnd)) /* if full size */ @@ -647,7 +650,7 @@ static void CC_PaintLumBar( HWND hDlg, i void CC_EditSetRGB( HWND hDlg, COLORREF cr ) { char buffer[10]; - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); int r = GetRValue(cr); int g = GetGValue(cr); int b = GetBValue(cr); @@ -670,7 +673,7 @@ void CC_EditSetRGB( HWND hDlg, COLORREF void CC_EditSetHSL( HWND hDlg, int h, int s, int l ) { char buffer[10]; - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6) )) /* if full size */ { @@ -692,7 +695,7 @@ void CC_EditSetHSL( HWND hDlg, int h, in void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPRECT lprect ) { int i; - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); EnableWindow( GetDlgItem(hDlg, 0x2cf), FALSE); CC_PrepareColorGraph(hDlg); @@ -728,7 +731,7 @@ static void CC_PaintPredefColorArray( HW HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); GetClientRect(hwnd, &rect); dx = rect.right / cols; @@ -770,7 +773,7 @@ void CC_PaintUserColorArray( HWND hDlg, HDC hdc; HBRUSH hBrush; int dx, dy, i, j, k; - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); GetClientRect(hwnd, &rect); @@ -842,7 +845,7 @@ static LONG CC_WMInitDialog( HWND hDlg, return FALSE; } - SetWindowLongPtrW(hDlg, DWLP_USER, (LONG_PTR)lpp); + SetPropW( hDlg, szColourDialogProp, lpp ); if (!(lpp->lpcc->Flags & CC_SHOWHELP)) ShowWindow( GetDlgItem(hDlg,0x40e), SW_HIDE); @@ -936,7 +939,7 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM UINT cokmsg; HDC hdc; COLORREF *cr; - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); TRACE("CC_WMCommand wParam=%x lParam=%lx\n", wParam, lParam); switch (LOWORD(wParam)) { @@ -1058,7 +1061,7 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) { PAINTSTRUCT ps; - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); BeginPaint(hDlg, &ps); /* we have to paint dialog children except text and buttons */ @@ -1079,7 +1082,7 @@ LRESULT CC_WMPaint( HWND hDlg, WPARAM wP */ LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam ) { - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); if (lpp->capturedGraph) { lpp->capturedGraph = 0; @@ -1095,7 +1098,7 @@ LRESULT CC_WMLButtonUp( HWND hDlg, WPARA */ LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) { - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); int r, g, b; if (lpp->capturedGraph) @@ -1133,7 +1136,7 @@ LRESULT CC_WMMouseMove( HWND hDlg, LPARA */ LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam ) { - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); int r, g, b, i; i = 0; @@ -1192,7 +1195,7 @@ static INT_PTR CALLBACK ColorDlgProc( HW { int res; - LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); + LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); if (message != WM_INITDIALOG) { if (!lpp) @@ -1217,7 +1220,7 @@ static INT_PTR CALLBACK ColorDlgProc( HW DeleteDC(lpp->hdcMem); DeleteObject(lpp->hbmMem); HeapFree(GetProcessHeap(), 0, lpp); - SetWindowLongPtrW(hDlg, DWLP_USER, 0); /* we don't need it anymore */ + SetPropW( hDlg, szColourDialogProp, 0 ); break; case WM_COMMAND: if (CC_WMCommand( hDlg, wParam, lParam, HIWORD(wParam), (HWND) lParam))

1 0

Alexandre Julliard : dbt.h: Added DBTF_ flags.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 18345170fd888ef54902bd8f80595bec3dc12f0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18345170fd888ef54902bd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 22:48:49 2006 +0100 dbt.h: Added DBTF_ flags. --- include/dbt.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/dbt.h b/include/dbt.h index 115a85b..9860707 100644 --- a/include/dbt.h +++ b/include/dbt.h @@ -78,6 +78,9 @@ typedef struct _DEV_BROADCAST_VOLUME WORD dbcv_flags; } DEV_BROADCAST_VOLUME, *PDEV_BROADCAST_VOLUME; +#define DBTF_MEDIA 0x0001 +#define DBTF_NET 0x0002 + typedef struct _DEV_BROADCAST_PORT_A { DWORD dbcp_size;

1 0

Alexandre Julliard : user: Support packing/ unpacking the WM_DEVICECHANGE message.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: a32b3e86ec3c6b83804d896ed1cc3438cd9dc482 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a32b3e86ec3c6b83804d896… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 22:48:37 2006 +0100 user: Support packing/unpacking the WM_DEVICECHANGE message. --- dlls/user/message.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index 8dc0b3c..8fe2ee7 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -32,6 +32,7 @@ #include "winuser.h" #include "winerror.h" #include "winnls.h" +#include "dbt.h" #include "dde.h" #include "wine/unicode.h" #include "wine/server.h" @@ -603,6 +604,12 @@ static size_t pack_message( HWND hwnd, U case WM_MDIGETACTIVE: if (lparam) return sizeof(BOOL); return 0; + case WM_DEVICECHANGE: + { + DEV_BROADCAST_HDR *header = (DEV_BROADCAST_HDR *)lparam; + push_data( data, header, header->dbch_size ); + return 0; + } case WM_WINE_SETWINDOWPOS: push_data( data, (WINDOWPOS *)lparam, sizeof(WINDOWPOS) ); return 0; @@ -646,7 +653,6 @@ static size_t pack_message( HWND hwnd, U case WM_DRAGLOOP: case WM_DRAGSELECT: case WM_DRAGMOVE: - case WM_DEVICECHANGE: FIXME( "msg %x (%s) not supported yet\n", message, SPY_GetMsgName(message, hwnd) ); data->count = -1; return 0; @@ -864,6 +870,9 @@ static BOOL unpack_message( HWND hwnd, U if (!*lparam) return TRUE; if (!get_buffer_space( buffer, sizeof(BOOL) )) return FALSE; break; + case WM_DEVICECHANGE: + minsize = sizeof(DEV_BROADCAST_HDR); + break; case WM_WINE_KEYBOARD_LL_HOOK: minsize = sizeof(KBDLLHOOKSTRUCT); break; @@ -904,7 +913,6 @@ static BOOL unpack_message( HWND hwnd, U case WM_DRAGLOOP: case WM_DRAGSELECT: case WM_DRAGMOVE: - case WM_DEVICECHANGE: FIXME( "msg %x (%s) not supported yet\n", message, SPY_GetMsgName(message, hwnd) ); return FALSE;

1 0

Robert Shearman : wininet: Fix InternetGetCookie with no matching cookies.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 1b8f7f06058b534e471be0df1763766c8185bf8b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b8f7f06058b534e471be0d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:20:24 2006 +0000 wininet: Fix InternetGetCookie with no matching cookies. Return FALSE and an error of ERROR_NO_MORE_ITEMS from InternetGetCookie when there are no cookies for the specified domain. This fixes a bug in sending a blank cookie to HTTP servers. --- dlls/wininet/cookie.c | 11 ++++++++--- dlls/wininet/tests/internet.c | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 80bd8ea..043de1b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -301,6 +301,14 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR l } } } + + if (!domain_count) + { + TRACE("no cookies found for %s\n", debugstr_w(hostName)); + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; + } + if (lpCookieData == NULL) { cnt += 1; /* NULL */ @@ -309,9 +317,6 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR l return TRUE; } - if (!domain_count) - return FALSE; - *lpdwSize = (cnt + 1)*sizeof(WCHAR); TRACE("Returning %i (from %i domains): %s\n", cnt, domain_count, diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index aeeee4e..293656c 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -27,7 +27,7 @@ #include "wine/test.h" -void InternetQueryOptionA_test() +static void InternetQueryOptionA_test(void) { HINTERNET hinet,hurl; DWORD len; @@ -107,7 +107,20 @@ void InternetQueryOptionA_test() InternetCloseHandle(hinet); } +static void test_get_cookie(void) +{ + DWORD len; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = InternetGetCookie("http://www.example.com", NULL, NULL, &len); + ok(!ret && GetLastError() == ERROR_NO_MORE_ITEMS, + "InternetGetCookie should have failed with %s and error %ld\n", + ret ? "TRUE" : "FALSE", GetLastError()); +} + START_TEST(internet) { InternetQueryOptionA_test(); + test_get_cookie(); }

1 0

Robert Shearman : wininet: Fix an off-by-one error in InternetCreateUrlW.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: e4adc07333da62a6498e9c0e95fbb2dc2ff58f50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4adc07333da62a6498e9c0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:19:46 2006 +0000 wininet: Fix an off-by-one error in InternetCreateUrlW. Fix an off-by-one error in the size of buffer used to store the port number in InternetCreateUrlW. --- dlls/wininet/internet.c | 4 ++-- dlls/wininet/tests/http.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e06c306..503c271 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3786,7 +3786,7 @@ static BOOL calc_url_length(LPURL_COMPON if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { - char szPort[MAX_WORD_DIGITS]; + char szPort[MAX_WORD_DIGITS+1]; sprintf(szPort, "%d", lpUrlComponents->nPort); *lpdwUrlLength += strlen(szPort); @@ -4021,7 +4021,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { - WCHAR szPort[MAX_WORD_DIGITS]; + WCHAR szPort[MAX_WORD_DIGITS+1]; sprintfW(szPort, percentD, lpUrlComponents->nPort); *lpszUrl = ':'; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a202268..3f512cf 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -50,6 +50,7 @@ #define CREATE_URL9 "about:blank" #define CREATE_URL10 "about://host/blank" #define CREATE_URL11 "about:" +#define CREATE_URL12 "http://www.winehq.org:65535" static HANDLE hCompleteEvent; @@ -1140,7 +1141,6 @@ static void InternetCreateUrlA_test(void urlComp.nPort = 8080; urlComp.lpszScheme = "about"; len = strlen(CREATE_URL11); - len++; /* work around bug in native wininet */ szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); @@ -1148,6 +1148,23 @@ static void InternetCreateUrlA_test(void ok(!strcmp(szUrl, CREATE_URL11), "Expected %s, got %s\n", CREATE_URL11, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); + + memset(&urlComp, 0, sizeof(urlComp)); + urlComp.dwStructSize = sizeof(URL_COMPONENTS); + urlComp.lpszScheme = "http"; + urlComp.dwSchemeLength = 0; + urlComp.nScheme = INTERNET_SCHEME_HTTP; + urlComp.lpszHostName = "www.winehq.org"; + urlComp.dwHostNameLength = 0; + urlComp.nPort = 65535; + len = strlen(CREATE_URL12); + szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ok(ret, "Expected success\n"); + ok(len == strlen(CREATE_URL12), "Expected len %d, got %ld\n", strlen(CREATE_URL12), len); + ok(!strcmp(szUrl, CREATE_URL12), "Expected %s, got %s\n", CREATE_URL12, szUrl); + + HeapFree(GetProcessHeap(), 0, szUrl); } static void HttpSendRequestEx_test(void)

1 0

Robert Shearman : wininet: Further InternetCreateFileW fixes.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: b0fcaf9d48fdc6fbc98fbaab5a8b833a7eae021e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0fcaf9d48fdc6fbc98fbaa… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:19:15 2006 +0000 wininet: Further InternetCreateFileW fixes. - Add the slash after the port number. - Only add the port number if the host name is present. --- dlls/wininet/internet.c | 49 ++++++++++++++++++++++++++------------------- dlls/wininet/tests/http.c | 19 ++++++++++++++++- 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5930ea5..e06c306 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3783,20 +3783,23 @@ static BOOL calc_url_length(LPURL_COMPON if (lpUrlComponents->lpszHostName) { *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, HostName); + + if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) + { + char szPort[MAX_WORD_DIGITS]; + + sprintf(szPort, "%d", lpUrlComponents->nPort); + *lpdwUrlLength += strlen(szPort); + *lpdwUrlLength += strlen(":"); + } + if (lpUrlComponents->lpszUrlPath && *lpUrlComponents->lpszUrlPath != '/') (*lpdwUrlLength)++; /* '/' */ } - if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) - { - char szPort[MAX_WORD_DIGITS]; - - sprintf(szPort, "%d", lpUrlComponents->nPort); - *lpdwUrlLength += strlen(szPort); - *lpdwUrlLength += strlen(":"); - } + if (lpUrlComponents->lpszUrlPath) + *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, UrlPath); - *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, UrlPath); return TRUE; } @@ -4016,6 +4019,18 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM memcpy(lpszUrl, lpUrlComponents->lpszHostName, dwLen * sizeof(WCHAR)); lpszUrl += dwLen; + if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) + { + WCHAR szPort[MAX_WORD_DIGITS]; + + sprintfW(szPort, percentD, lpUrlComponents->nPort); + *lpszUrl = ':'; + lpszUrl++; + dwLen = strlenW(szPort); + memcpy(lpszUrl, szPort, dwLen * sizeof(WCHAR)); + lpszUrl += dwLen; + } + /* add slash between hostname and path if necessary */ if (lpUrlComponents->lpszUrlPath && *lpUrlComponents->lpszUrlPath != '/') { @@ -4024,22 +4039,14 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM } } - if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) - { - WCHAR szPort[MAX_WORD_DIGITS]; - sprintfW(szPort, percentD, lpUrlComponents->nPort); - *lpszUrl = ':'; - lpszUrl++; - dwLen = strlenW(szPort); - memcpy(lpszUrl, szPort, dwLen * sizeof(WCHAR)); + if (lpUrlComponents->lpszUrlPath) + { + dwLen = URL_GET_COMP_LENGTH(lpUrlComponents, UrlPath); + memcpy(lpszUrl, lpUrlComponents->lpszUrlPath, dwLen * sizeof(WCHAR)); lpszUrl += dwLen; } - dwLen = URL_GET_COMP_LENGTH(lpUrlComponents, UrlPath); - memcpy(lpszUrl, lpUrlComponents->lpszUrlPath, dwLen * sizeof(WCHAR)); - lpszUrl += dwLen; - *lpszUrl = '\0'; return TRUE; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a4b66eb..a202268 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -49,6 +49,7 @@ #define CREATE_URL8 "https://username:password@www.winehq.org/site/about" #define CREATE_URL9 "about:blank" #define CREATE_URL10 "about://host/blank" +#define CREATE_URL11 "about:" static HANDLE hCompleteEvent; @@ -1129,8 +1130,22 @@ static void InternetCreateUrlA_test(void szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); - ok(len == strlen(CREATE_URL10), "Expected len %d, got %ld\n", strlen(CREATE_URL9), len); - ok(!strcmp(szUrl, CREATE_URL10), "Expected %s, got %s\n", CREATE_URL9, szUrl); + ok(len == strlen(CREATE_URL10), "Expected len %d, got %ld\n", strlen(CREATE_URL10), len); + ok(!strcmp(szUrl, CREATE_URL10), "Expected %s, got %s\n", CREATE_URL10, szUrl); + + HeapFree(GetProcessHeap(), 0, szUrl); + + memset(&urlComp, 0, sizeof(urlComp)); + urlComp.dwStructSize = sizeof(URL_COMPONENTS); + urlComp.nPort = 8080; + urlComp.lpszScheme = "about"; + len = strlen(CREATE_URL11); + len++; /* work around bug in native wininet */ + szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ok(ret, "Expected success\n"); + ok(len == strlen(CREATE_URL11), "Expected len %d, got %ld\n", strlen(CREATE_URL11), len); + ok(!strcmp(szUrl, CREATE_URL11), "Expected %s, got %s\n", CREATE_URL11, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); }

1 0

Robert Shearman : wininet: If necessary, add a slash between the hostname and path in
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: d3047aaebabed5f04b2809a5069f50113d1deac4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3047aaebabed5f04b2809a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:18:24 2006 +0000 wininet: If necessary, add a slash between the hostname and path in InternetCreateUrlW. --- dlls/wininet/internet.c | 11 +++++++++++ dlls/wininet/tests/http.c | 17 +++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5beb622..5930ea5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3781,7 +3781,11 @@ static BOOL calc_url_length(LPURL_COMPON } if (lpUrlComponents->lpszHostName) + { *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, HostName); + if (lpUrlComponents->lpszUrlPath && *lpUrlComponents->lpszUrlPath != '/') + (*lpdwUrlLength)++; /* '/' */ + } if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { @@ -4011,6 +4015,13 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM dwLen = URL_GET_COMP_LENGTH(lpUrlComponents, HostName); memcpy(lpszUrl, lpUrlComponents->lpszHostName, dwLen * sizeof(WCHAR)); lpszUrl += dwLen; + + /* add slash between hostname and path if necessary */ + if (lpUrlComponents->lpszUrlPath && *lpUrlComponents->lpszUrlPath != '/') + { + *lpszUrl = '/'; + lpszUrl++; + } } if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 90a972c..a4b66eb 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -48,6 +48,7 @@ #define CREATE_URL7 "http://username:password@www.winehq.org:42/site/about" #define CREATE_URL8 "https://username:password@www.winehq.org/site/about" #define CREATE_URL9 "about:blank" +#define CREATE_URL10 "about://host/blank" static HANDLE hCompleteEvent; @@ -1109,6 +1110,7 @@ static void InternetCreateUrlA_test(void urlComp.lpszUrlPath = "blank"; urlComp.dwUrlPathLength = 5; len = strlen(CREATE_URL9); + len++; /* work around bug in native wininet */ szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); @@ -1116,6 +1118,21 @@ static void InternetCreateUrlA_test(void ok(!strcmp(szUrl, CREATE_URL9), "Expected %s, got %s\n", CREATE_URL9, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); + + memset(&urlComp, 0, sizeof(urlComp)); + urlComp.dwStructSize = sizeof(URL_COMPONENTS); + urlComp.lpszScheme = "about"; + urlComp.lpszHostName = "host"; + urlComp.lpszUrlPath = "blank"; + len = strlen(CREATE_URL10); + len++; /* work around bug in native wininet */ + szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + ok(ret, "Expected success\n"); + ok(len == strlen(CREATE_URL10), "Expected len %d, got %ld\n", strlen(CREATE_URL9), len); + ok(!strcmp(szUrl, CREATE_URL10), "Expected %s, got %s\n", CREATE_URL9, szUrl); + + HeapFree(GetProcessHeap(), 0, szUrl); } static void HttpSendRequestEx_test(void)

1 0

Robert Shearman : wininet: More InternetCreateUrlW fixes.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 8eab78c235b10b8b359283e2a34c807823d1627b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8eab78c235b10b8b359283e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:17:49 2006 +0000 wininet: More InternetCreateUrlW fixes. - Don't add double slashes for opaque URLs. - The default port number for all other schemes is 0. --- dlls/wininet/internet.c | 31 +++++++++++++++++++++++++++---- dlls/wininet/tests/http.c | 2 -- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4a2f001..5beb622 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3700,9 +3700,23 @@ static BOOL url_uses_default_port(INTERN (nPort == INTERNET_DEFAULT_GOPHER_PORT)) return TRUE; + if (nPort == INTERNET_INVALID_PORT_NUMBER) + return TRUE; + return FALSE; } +/* opaque urls do not fit into the standard url hierarchy and don't have + * two following slashes */ +static inline BOOL scheme_is_opaque(INTERNET_SCHEME nScheme) +{ + return (nScheme != INTERNET_SCHEME_FTP) && + (nScheme != INTERNET_SCHEME_GOPHER) && + (nScheme != INTERNET_SCHEME_HTTP) && + (nScheme != INTERNET_SCHEME_HTTPS) && + (nScheme != INTERNET_SCHEME_FILE); +} + static LPCWSTR INTERNET_GetSchemeString(INTERNET_SCHEME scheme) { int index; @@ -3742,7 +3756,9 @@ static BOOL calc_url_length(LPURL_COMPON *lpdwUrlLength += strlenW(scheme); } - *lpdwUrlLength += strlen("://"); + (*lpdwUrlLength)++; /* ':' */ + if (!scheme_is_opaque(nScheme) || lpUrlComponents->lpszHostName) + *lpdwUrlLength += strlen("//"); if (lpUrlComponents->lpszUserName) { @@ -3909,7 +3925,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM DWORD dwLen; INTERNET_SCHEME nScheme; - static const WCHAR colonSlashW[] = {':','/','/'}; + static const WCHAR slashSlashW[] = {'/','/'}; static const WCHAR percentD[] = {'%','d',0}; TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); @@ -3960,8 +3976,15 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM lpszUrl += dwLen; } - memcpy(lpszUrl, colonSlashW, sizeof(colonSlashW)); - lpszUrl += sizeof(colonSlashW)/sizeof(colonSlashW[0]); + /* all schemes are followed by at least a colon */ + *lpszUrl = ':'; + lpszUrl++; + + if (!scheme_is_opaque(nScheme) || lpUrlComponents->lpszHostName) + { + memcpy(lpszUrl, slashSlashW, sizeof(slashSlashW)); + lpszUrl += sizeof(slashSlashW)/sizeof(slashSlashW[0]); + } if (lpUrlComponents->lpszUserName) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 72ab72c..90a972c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1111,11 +1111,9 @@ static void InternetCreateUrlA_test(void len = strlen(CREATE_URL9); szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); - todo_wine { ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL9), "Expected len %d, got %ld\n", strlen(CREATE_URL9), len); ok(!strcmp(szUrl, CREATE_URL9), "Expected %s, got %s\n", CREATE_URL9, szUrl); - } HeapFree(GetProcessHeap(), 0, szUrl); }

1 0

Robert Shearman : wininet: Parse the scheme the string in InternetCreateFileW.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: e58a448c4a11c1d5058c81e1c786f10f4a80cf42 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e58a448c4a11c1d5058c81e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:16:41 2006 +0000 wininet: Parse the scheme the string in InternetCreateFileW. Parse the scheme the string in InternetCreateFileW and rewrite url_uses_default_port using schemes instead of strings. --- dlls/wininet/internet.c | 59 +++++++++++++++++++++++++++------------------ dlls/wininet/tests/http.c | 2 -- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3255384..4a2f001 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3685,28 +3685,19 @@ BOOL WINAPI InternetCombineUrlW(LPCWSTR #define URL_GET_COMP_LENGTHA(url, component) ((url)->dw##component##Length ? \ (url)->dw##component##Length : strlen((url)->lpsz##component)) -static BOOL url_uses_default_port(LPURL_COMPONENTSW lpUrlComponents) +static BOOL url_uses_default_port(INTERNET_SCHEME nScheme, INTERNET_PORT nPort) { - static const WCHAR httpW[] = {'h','t','t','p',0}; - static const WCHAR httpsW[] = {'h','t','t','p','s',0}; - static const WCHAR ftpW[] = {'f','t','p',0}; - static const WCHAR gopherW[] = {'g','o','p','h','e','r',0}; - DWORD len; - - if (!lpUrlComponents->lpszScheme) return FALSE; - - len = URL_GET_COMP_LENGTH(lpUrlComponents, Scheme); - if (!strncmpW(lpUrlComponents->lpszScheme, httpW, len) && - (lpUrlComponents->nPort == INTERNET_DEFAULT_HTTP_PORT)) + if ((nScheme == INTERNET_SCHEME_HTTP) && + (nPort == INTERNET_DEFAULT_HTTP_PORT)) return TRUE; - if (!strncmpW(lpUrlComponents->lpszScheme, httpsW, len) && - (lpUrlComponents->nPort == INTERNET_DEFAULT_HTTPS_PORT)) + if ((nScheme == INTERNET_SCHEME_HTTPS) && + (nPort == INTERNET_DEFAULT_HTTPS_PORT)) return TRUE; - if (!strncmpW(lpUrlComponents->lpszScheme, ftpW, len) && - (lpUrlComponents->nPort == INTERNET_DEFAULT_FTP_PORT)) + if ((nScheme == INTERNET_SCHEME_FTP) && + (nPort == INTERNET_DEFAULT_FTP_PORT)) return TRUE; - if (!strncmpW(lpUrlComponents->lpszScheme, gopherW, len) && - (lpUrlComponents->nPort == INTERNET_DEFAULT_GOPHER_PORT)) + if ((nScheme == INTERNET_SCHEME_GOPHER) && + (nPort == INTERNET_DEFAULT_GOPHER_PORT)) return TRUE; return FALSE; @@ -3729,14 +3720,25 @@ static LPCWSTR INTERNET_GetSchemeString( static BOOL calc_url_length(LPURL_COMPONENTSW lpUrlComponents, LPDWORD lpdwUrlLength) { + INTERNET_SCHEME nScheme; + *lpdwUrlLength = 0; if (lpUrlComponents->lpszScheme) - *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, Scheme); + { + DWORD dwLen = URL_GET_COMP_LENGTH(lpUrlComponents, Scheme); + *lpdwUrlLength += dwLen; + nScheme = GetInternetSchemeW(lpUrlComponents->lpszScheme, dwLen); + } else { - LPCWSTR scheme = INTERNET_GetSchemeString(lpUrlComponents->nScheme); - TRACE("got scheme %s\n", debugstr_w(scheme)); + LPCWSTR scheme; + + nScheme = lpUrlComponents->nScheme; + + if (nScheme == INTERNET_SCHEME_DEFAULT) + nScheme = INTERNET_SCHEME_HTTP; + scheme = INTERNET_GetSchemeString(nScheme); *lpdwUrlLength += strlenW(scheme); } @@ -3765,7 +3767,7 @@ static BOOL calc_url_length(LPURL_COMPON if (lpUrlComponents->lpszHostName) *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, HostName); - if (!url_uses_default_port(lpUrlComponents)) + if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { char szPort[MAX_WORD_DIGITS]; @@ -3905,6 +3907,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM LPWSTR lpszUrl, LPDWORD lpdwUrlLength) { DWORD dwLen; + INTERNET_SCHEME nScheme; static const WCHAR colonSlashW[] = {':','/','/'}; static const WCHAR percentD[] = {'%','d',0}; @@ -3940,10 +3943,18 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM dwLen = URL_GET_COMP_LENGTH(lpUrlComponents, Scheme); memcpy(lpszUrl, lpUrlComponents->lpszScheme, dwLen * sizeof(WCHAR)); lpszUrl += dwLen; + + nScheme = GetInternetSchemeW(lpUrlComponents->lpszScheme, dwLen); } else { - LPCWSTR scheme = INTERNET_GetSchemeString(lpUrlComponents->nScheme); + LPCWSTR scheme; + nScheme = lpUrlComponents->nScheme; + + if (nScheme == INTERNET_SCHEME_DEFAULT) + nScheme = INTERNET_SCHEME_HTTP; + + scheme = INTERNET_GetSchemeString(nScheme); dwLen = strlenW(scheme); memcpy(lpszUrl, scheme, dwLen * sizeof(WCHAR)); lpszUrl += dwLen; @@ -3979,7 +3990,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM lpszUrl += dwLen; } - if (!url_uses_default_port(lpUrlComponents)) + if (!url_uses_default_port(nScheme, lpUrlComponents->nPort)) { WCHAR szPort[MAX_WORD_DIGITS]; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 92f4c60..72ab72c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -917,13 +917,11 @@ static void InternetCreateUrlA_test(void SetLastError(0xdeadbeef); urlComp.lpszScheme = NULL; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); - todo_wine { ok(ret, "Expected success\n"); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %ld\n", GetLastError()); ok(len == 50, "Expected len 50, got %ld\n", len); ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl); - } /* alloced szUrl, invalid nScheme * any nScheme out of range seems ignored

1 0

Robert Shearman : wininet: Get the string for the scheme if specified only by the
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 02839948d25a1cc99c5c89c9596ae3c3502631fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02839948d25a1cc99c5c89c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:15:45 2006 +0000 wininet: Get the string for the scheme if specified only by the INTERNET_SCHEME enumeration in InternetCreateUrlW. --- dlls/wininet/internet.c | 28 +++++++++++++++++++++++++++- dlls/wininet/tests/http.c | 18 ++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7b87009..3255384 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3712,6 +3712,17 @@ static BOOL url_uses_default_port(LPURL_ return FALSE; } +static LPCWSTR INTERNET_GetSchemeString(INTERNET_SCHEME scheme) +{ + int index; + if (scheme < INTERNET_SCHEME_FIRST) + return NULL; + index = scheme - INTERNET_SCHEME_FIRST; + if (index >= sizeof(url_schemes)/sizeof(url_schemes[0])) + return NULL; + return (LPCWSTR)&url_schemes[index]; +} + /* we can calculate using ansi strings because we're just * calculating string length, not size */ @@ -3720,7 +3731,15 @@ static BOOL calc_url_length(LPURL_COMPON { *lpdwUrlLength = 0; - *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, Scheme); + if (lpUrlComponents->lpszScheme) + *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, Scheme); + else + { + LPCWSTR scheme = INTERNET_GetSchemeString(lpUrlComponents->nScheme); + TRACE("got scheme %s\n", debugstr_w(scheme)); + *lpdwUrlLength += strlenW(scheme); + } + *lpdwUrlLength += strlen("://"); if (lpUrlComponents->lpszUserName) @@ -3922,6 +3941,13 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM memcpy(lpszUrl, lpUrlComponents->lpszScheme, dwLen * sizeof(WCHAR)); lpszUrl += dwLen; } + else + { + LPCWSTR scheme = INTERNET_GetSchemeString(lpUrlComponents->nScheme); + dwLen = strlenW(scheme); + memcpy(lpszUrl, scheme, dwLen * sizeof(WCHAR)); + lpszUrl += dwLen; + } memcpy(lpszUrl, colonSlashW, sizeof(colonSlashW)); lpszUrl += sizeof(colonSlashW)/sizeof(colonSlashW[0]); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5d25f0c..92f4c60 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -47,6 +47,7 @@ #define CREATE_URL6 "nhttp://username:password@www.winehq.org:80/site/about" #define CREATE_URL7 "http://username:password@www.winehq.org:42/site/about" #define CREATE_URL8 "https://username:password@www.winehq.org/site/about" +#define CREATE_URL9 "about:blank" static HANDLE hCompleteEvent; @@ -1102,6 +1103,23 @@ static void InternetCreateUrlA_test(void ok(!strcmp(szUrl, CREATE_URL8), "Expected %s, got %s\n", CREATE_URL8, szUrl); HeapFree(GetProcessHeap(), 0, szUrl); + + memset(&urlComp, 0, sizeof(urlComp)); + urlComp.dwStructSize = sizeof(URL_COMPONENTS); + urlComp.lpszScheme = "about"; + urlComp.dwSchemeLength = 5; + urlComp.lpszUrlPath = "blank"; + urlComp.dwUrlPathLength = 5; + len = strlen(CREATE_URL9); + szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); + todo_wine { + ok(ret, "Expected success\n"); + ok(len == strlen(CREATE_URL9), "Expected len %d, got %ld\n", strlen(CREATE_URL9), len); + ok(!strcmp(szUrl, CREATE_URL9), "Expected %s, got %s\n", CREATE_URL9, szUrl); + } + + HeapFree(GetProcessHeap(), 0, szUrl); } static void HttpSendRequestEx_test(void)

1 0

Robert Shearman : wininet: The host name is optional in InternetCreateUrlW.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 01219c65aa1d23bf56da3126039ffe5ee41e97e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=01219c65aa1d23bf56da312… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:15:00 2006 +0000 wininet: The host name is optional in InternetCreateUrlW. --- dlls/wininet/internet.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 55f6acc..7b87009 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3743,7 +3743,8 @@ static BOOL calc_url_length(LPURL_COMPON *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, Password); } - *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, HostName); + if (lpUrlComponents->lpszHostName) + *lpdwUrlLength += URL_GET_COMP_LENGTH(lpUrlComponents, HostName); if (!url_uses_default_port(lpUrlComponents)) { @@ -3945,9 +3946,12 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM lpszUrl++; } - dwLen = URL_GET_COMP_LENGTH(lpUrlComponents, HostName); - memcpy(lpszUrl, lpUrlComponents->lpszHostName, dwLen * sizeof(WCHAR)); - lpszUrl += dwLen; + if (lpUrlComponents->lpszHostName) + { + dwLen = URL_GET_COMP_LENGTH(lpUrlComponents, HostName); + memcpy(lpszUrl, lpUrlComponents->lpszHostName, dwLen * sizeof(WCHAR)); + lpszUrl += dwLen; + } if (!url_uses_default_port(lpUrlComponents)) {

1 0

Robert Shearman : wininet: Use an array of schemes for mapping from a string to an INTERNET_SCHEME.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: ed90c868a9362a44204dbfc2bb6b15f9efd07cd4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed90c868a9362a44204dbfc… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:14:21 2006 +0000 wininet: Use an array of schemes for mapping from a string to an INTERNET_SCHEME. Use an array of schemes so that it can be re-used for mapping from INTERNET_SCHEME back to a string and simplify the code in GetInternetSchemeW. --- dlls/wininet/internet.c | 51 ++++++++++++++++++----------------------------- 1 files changed, 20 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f655a0c..55f6acc 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1199,6 +1199,18 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lps return TRUE; } +static const WCHAR url_schemes[][7] = +{ + {'f','t','p',0}, + {'g','o','p','h','e','r',0}, + {'h','t','t','p',0}, + {'h','t','t','p','s',0}, + {'f','i','l','e',0}, + {'n','e','w','s',0}, + {'m','a','i','l','t','o',0}, + {'r','e','s',0}, +}; + /*********************************************************************** * GetInternetSchemeW (internal) * @@ -1211,41 +1223,18 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lps */ static INTERNET_SCHEME GetInternetSchemeW(LPCWSTR lpszScheme, DWORD nMaxCmp) { - INTERNET_SCHEME iScheme=INTERNET_SCHEME_UNKNOWN; - static const WCHAR lpszFtp[]={'f','t','p',0}; - static const WCHAR lpszGopher[]={'g','o','p','h','e','r',0}; - static const WCHAR lpszHttp[]={'h','t','t','p',0}; - static const WCHAR lpszHttps[]={'h','t','t','p','s',0}; - static const WCHAR lpszFile[]={'f','i','l','e',0}; - static const WCHAR lpszNews[]={'n','e','w','s',0}; - static const WCHAR lpszMailto[]={'m','a','i','l','t','o',0}; - static const WCHAR lpszRes[]={'r','e','s',0}; - WCHAR* tempBuffer=NULL; + int i; + TRACE("%s %ld\n",debugstr_wn(lpszScheme, nMaxCmp), nMaxCmp); + if(lpszScheme==NULL) return INTERNET_SCHEME_UNKNOWN; - tempBuffer=HeapAlloc(GetProcessHeap(),0,(nMaxCmp+1)*sizeof(WCHAR)); - lstrcpynW(tempBuffer,lpszScheme,nMaxCmp+1); - strlwrW(tempBuffer); - if (nMaxCmp==strlenW(lpszFtp) && !strncmpW(lpszFtp, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_FTP; - else if (nMaxCmp==strlenW(lpszGopher) && !strncmpW(lpszGopher, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_GOPHER; - else if (nMaxCmp==strlenW(lpszHttp) && !strncmpW(lpszHttp, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_HTTP; - else if (nMaxCmp==strlenW(lpszHttps) && !strncmpW(lpszHttps, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_HTTPS; - else if (nMaxCmp==strlenW(lpszFile) && !strncmpW(lpszFile, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_FILE; - else if (nMaxCmp==strlenW(lpszNews) && !strncmpW(lpszNews, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_NEWS; - else if (nMaxCmp==strlenW(lpszMailto) && !strncmpW(lpszMailto, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_MAILTO; - else if (nMaxCmp==strlenW(lpszRes) && !strncmpW(lpszRes, tempBuffer, nMaxCmp)) - iScheme=INTERNET_SCHEME_RES; - HeapFree(GetProcessHeap(),0,tempBuffer); - return iScheme; + for (i = 0; i < sizeof(url_schemes)/sizeof(url_schemes[0]); i++) + if (!strncmpW(lpszScheme, url_schemes[i], nMaxCmp)) + return INTERNET_SCHEME_FIRST + i; + + return INTERNET_SCHEME_UNKNOWN; } /***********************************************************************

1 0

Robert Shearman : wininet: Fix Trace in InternetCreateUrl.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: e2b7bc1efd0aeb6cd2c339478e602101753ed8a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e2b7bc1efd0aeb6cd2c3394… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:12:56 2006 +0000 wininet: Fix Trace in InternetCreateUrl. The url passed in to InternetCreateUrl is an out parameter, so don't dump it. --- dlls/wininet/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 8c8a6e8..f655a0c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3849,7 +3849,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COM LPWSTR urlW = NULL; URL_COMPONENTSW urlCompW; - TRACE("(%p,%ld,%s,%p)\n", lpUrlComponents, dwFlags, debugstr_a(lpszUrl), lpdwUrlLength); + TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); if (!lpUrlComponents) return FALSE; @@ -3900,7 +3900,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM static const WCHAR colonSlashW[] = {':','/','/'}; static const WCHAR percentD[] = {'%','d',0}; - TRACE("(%p,%ld,%s,%p)\n", lpUrlComponents, dwFlags, debugstr_w(lpszUrl), lpdwUrlLength); + TRACE("(%p,%ld,%p,%p)\n", lpUrlComponents, dwFlags, lpszUrl, lpdwUrlLength); if (!lpUrlComponents) return FALSE;

1 0

Robert Shearman : wininet: Fix redirects with relative URIs instead of absolute URIs.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 0590025e3c223602783273f3d1b054f44568d66d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0590025e3c223602783273f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Mar 9 15:11:59 2006 +0000 wininet: Fix redirects with relative URIs instead of absolute URIs. --- dlls/wininet/http.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 495b0b5..156bc64 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1980,6 +1980,55 @@ static BOOL HTTP_HandleRedirect(LPWININE WCHAR protocol[32], hostName[MAXHOSTNAME], userName[1024]; static const WCHAR szHttp[] = {'h','t','t','p',0}; static const WCHAR szHttps[] = {'h','t','t','p','s',0}; + DWORD url_length = 0; + LPWSTR orig_url; + LPWSTR combined_url; + + urlComponents.dwStructSize = sizeof(URL_COMPONENTSW); + urlComponents.lpszScheme = (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) ? (LPWSTR)szHttps : (LPWSTR)szHttp; + urlComponents.dwSchemeLength = 0; + urlComponents.lpszHostName = lpwhs->lpszHostName; + urlComponents.dwHostNameLength = 0; + urlComponents.nPort = lpwhs->nHostPort; + urlComponents.lpszUserName = lpwhs->lpszUserName; + urlComponents.dwUserNameLength = 0; + urlComponents.lpszPassword = NULL; + urlComponents.dwPasswordLength = 0; + urlComponents.lpszUrlPath = lpwhr->lpszPath; + urlComponents.dwUrlPathLength = 0; + urlComponents.lpszExtraInfo = NULL; + urlComponents.dwExtraInfoLength = 0; + + if (!InternetCreateUrlW(&urlComponents, 0, NULL, &url_length) && + (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) + return FALSE; + + url_length++; /* for nul terminating character */ + orig_url = HeapAlloc(GetProcessHeap(), 0, url_length * sizeof(WCHAR)); + + if (!InternetCreateUrlW(&urlComponents, 0, orig_url, &url_length)) + { + HeapFree(GetProcessHeap(), 0, orig_url); + return FALSE; + } + + url_length = 0; + if (!InternetCombineUrlW(orig_url, lpszUrl, NULL, &url_length, ICU_ENCODE_SPACES_ONLY) && + (GetLastError() != ERROR_INSUFFICIENT_BUFFER)) + { + HeapFree(GetProcessHeap(), 0, orig_url); + return FALSE; + } + combined_url = HeapAlloc(GetProcessHeap(), 0, url_length * sizeof(WCHAR)); + + if (!InternetCombineUrlW(orig_url, lpszUrl, combined_url, &url_length, ICU_ENCODE_SPACES_ONLY)) + { + HeapFree(GetProcessHeap(), 0, orig_url); + HeapFree(GetProcessHeap(), 0, combined_url); + return FALSE; + } + HeapFree(GetProcessHeap(), 0, orig_url); + userName[0] = 0; hostName[0] = 0; protocol[0] = 0; @@ -1997,8 +2046,12 @@ static BOOL HTTP_HandleRedirect(LPWININE urlComponents.dwUrlPathLength = 2048; urlComponents.lpszExtraInfo = NULL; urlComponents.dwExtraInfoLength = 0; - if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) + if(!InternetCrackUrlW(combined_url, strlenW(combined_url), 0, &urlComponents)) + { + HeapFree(GetProcessHeap(), 0, combined_url); return FALSE; + } + HeapFree(GetProcessHeap(), 0, combined_url); if (!strncmpW(szHttp, urlComponents.lpszScheme, strlenW(szHttp)) && (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE))

1 0

Christoph Frick : dinput/linuxinput: Fix handling of DIPH_BYID.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 61de4e7425a57bc0f04a938f6ffc57afacb52c93 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61de4e7425a57bc0f04a938… Author: Christoph Frick <rid(a)zefix.tv> Date: Thu Mar 9 13:38:23 2006 +0100 dinput/linuxinput: Fix handling of DIPH_BYID. - handling of DIPH_BYID - use regular id and not shifted one also for axes - may only Acquire after SetDataFormat --- dlls/dinput/joystick_linuxinput.c | 53 +++++++++++++------------------------ 1 files changed, 19 insertions(+), 34 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index b2d9480..5530c16 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -466,7 +466,10 @@ static HRESULT WINAPI JoystickAImpl_Acqu TRACE("(this=%p)\n",This); if (This->joyfd!=-1) - return 0; + return S_FALSE; + if (This->df==NULL) { + return DIERR_INVALIDPARAM; + } for (i=0;i<64;i++) { sprintf(buf,EVDEVPREFIX"%d",i); if (-1==(This->joyfd=open(buf,O_RDWR))) { @@ -627,40 +630,22 @@ static void fake_current_js_state(Joysti static int find_property_offset(JoystickImpl *This, LPCDIPROPHEADER ph) { - int i,c; switch (ph->dwHow) { - case DIPH_BYOFFSET: - for (i=0; i<This->df->dwNumObjs; i++) { - if (This->df->rgodf[i].dwOfs == ph->dwObj) { - return i; - } - } - break; - case DIPH_BYID: - /* XXX: this is a hack - see below */ - c = DIDFT_GETINSTANCE(ph->dwObj)>>WINE_JOYSTICK_AXIS_BASE; - for (i=0; (c&1)==0 && i<0x0F; i++) { - c >>= 1; - } - if (i<0x0F) { - return i; - } - - /* XXX - the following part won't work with LiveForSpeed - * - the game sets the dwTypes to something else then - * the ddoi.dwType set in EnumObjects - */ -#if 0 - for (i=0; i<This->df->dwNumObjs; i++) { - TRACE("dwType='%08x'\n", This->df->rgodf[i].dwType); - if ((This->df->rgodf[i].dwType & 0x00ffffff) == (ph->dwObj & 0x00ffffff)) { - return i; - } - } -#endif - break; + case DIPH_BYOFFSET: { + int i; + for (i=0; i<This->df->dwNumObjs; i++) { + if (This->df->rgodf[i].dwOfs == ph->dwObj) { + return i; + } + } + } + break; + case DIPH_BYID: { + return DIDFT_GETINSTANCE(ph->dwObj)>>WINE_JOYSTICK_AXIS_BASE; + } + break; default: - FIXME("Unhandled ph->dwHow=='%04X'\n", (unsigned int)ph->dwHow); + FIXME("Unhandled ph->dwHow=='%04X'\n", (unsigned int)ph->dwHow); } return -1; @@ -1075,7 +1060,7 @@ static HRESULT WINAPI JoystickAImpl_Enum default: FIXME("unhandled abs axis %d, ignoring!\n",i); } - ddoi.dwType = DIDFT_MAKEINSTANCE((1<<i) << WINE_JOYSTICK_AXIS_BASE) | DIDFT_ABSAXIS; + ddoi.dwType = DIDFT_MAKEINSTANCE(i << WINE_JOYSTICK_AXIS_BASE) | DIDFT_ABSAXIS; /* Linux event force feedback supports only (and always) x and y axes */ if (i == ABS_X || i == ABS_Y) { if (This->has_ff)

1 0

Dmitry Timoshkov : gdi: Load system fonts from $(datadir)/wine/ fonts if loading from
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 6b49f6bd86ffe0e9674d7dee5abc860630822974 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6b49f6bd86ffe0e9674d7de… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 9 15:13:08 2006 +0800 gdi: Load system fonts from $(datadir)/wine/fonts if loading from %windir%\fonts has failed. --- dlls/gdi/freetype.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 51e92b8..a365778 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -1123,6 +1123,30 @@ LOAD_FUNCPTR(FcPatternGet); return; } +static BOOL load_font_from_data_dir(LPCWSTR file) +{ + BOOL ret = FALSE; + const char *data_dir = wine_get_data_dir(); + + if (data_dir) + { + INT len; + char *unix_name; + + len = WideCharToMultiByte(CP_UNIXCP, 0, file, -1, NULL, 0, NULL, NULL); + + unix_name = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + len + sizeof("/fonts/")); + + strcpy(unix_name, data_dir); + strcat(unix_name, "/fonts/"); + + WideCharToMultiByte(CP_UNIXCP, 0, file, -1, unix_name + strlen(unix_name), len, NULL, NULL); + + ret = AddFontFileToList(unix_name, NULL, ADDFONT_FORCE_BITMAP); + HeapFree(GetProcessHeap(), 0, unix_name); + } + return ret; +} static void load_system_fonts(void) { @@ -1140,11 +1164,15 @@ static void load_system_fonts(void) dlen = sizeof(data); if(RegQueryValueExW(hkey, *value, 0, &type, (void*)data, &dlen) == ERROR_SUCCESS && type == REG_SZ) { + BOOL added = FALSE; + sprintfW(pathW, fmtW, windowsdir, data); if((unixname = wine_get_unix_file_name(pathW))) { - AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); + added = AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unixname); } + if (!added) + load_font_from_data_dir(data); } } RegCloseKey(hkey); @@ -1592,12 +1620,16 @@ BOOL WineEngInit(void) { WCHAR pathW[MAX_PATH]; static const WCHAR fmtW[] = {'%','s','\\','%','s','\0'}; + BOOL added = FALSE; + sprintfW(pathW, fmtW, windowsdir, data); if((unixname = wine_get_unix_file_name(pathW))) { - AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); + added = AddFontFileToList(unixname, NULL, ADDFONT_FORCE_BITMAP); HeapFree(GetProcessHeap(), 0, unixname); } + if (!added) + load_font_from_data_dir(data); } /* reset dlen and vlen */ dlen = datalen;

1 0

Dmitry Timoshkov : gdi: A better workaround for extended user style pens.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 434a60ba1df0d8a124e9a09802a466d0492fd1d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=434a60ba1df0d8a124e9a09… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 9 15:12:43 2006 +0800 gdi: A better workaround for extended user style pens. --- dlls/gdi/enhmfdrv/objects.c | 23 ++++++++++++++--------- dlls/gdi/mfdrv/objects.c | 23 ++++++++++++++--------- dlls/wineps/pen.c | 23 ++++++++++++++--------- dlls/x11drv/pen.c | 23 ++++++++++++++--------- 4 files changed, 56 insertions(+), 36 deletions(-) diff --git a/dlls/gdi/enhmfdrv/objects.c b/dlls/gdi/enhmfdrv/objects.c index 9d8b14d..ad84301 100644 --- a/dlls/gdi/enhmfdrv/objects.c +++ b/dlls/gdi/enhmfdrv/objects.c @@ -401,16 +401,21 @@ static HPEN EMFDRV_CreatePenIndirect(PHY if (!GetObjectW( hPen, sizeof(emr.lopn), &emr.lopn )) { /* must be an extended pen */ - EXTLOGPEN elp; - if (!GetObjectW( hPen, sizeof(elp), &elp )) - { - FIXME("extended pen %p not supported\n", hPen); - return 0; - } - emr.lopn.lopnStyle = elp.elpPenStyle; - emr.lopn.lopnWidth.x = elp.elpWidth; + EXTLOGPEN *elp; + INT size = GetObjectW( hPen, 0, NULL ); + + if (!size) return 0; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( hPen, size, elp ); + /* FIXME: add support for user style pens */ + emr.lopn.lopnStyle = elp->elpPenStyle; + emr.lopn.lopnWidth.x = elp->elpWidth; emr.lopn.lopnWidth.y = 0; - emr.lopn.lopnColor = elp.elpColor; + emr.lopn.lopnColor = elp->elpColor; + + HeapFree( GetProcessHeap(), 0, elp ); } emr.emr.iType = EMR_CREATEPEN; diff --git a/dlls/gdi/mfdrv/objects.c b/dlls/gdi/mfdrv/objects.c index e0859ac..a7bc229 100644 --- a/dlls/gdi/mfdrv/objects.c +++ b/dlls/gdi/mfdrv/objects.c @@ -406,16 +406,21 @@ HPEN MFDRV_SelectPen( PHYSDEV dev, HPEN if (!GetObject16( HPEN_16(hpen), sizeof(logpen), &logpen )) { /* must be an extended pen */ - EXTLOGPEN elp; - if (!GetObjectW( hpen, sizeof(elp), &elp )) - { - FIXME("extended pen %p not supported\n", hpen); - return 0; - } - logpen.lopnStyle = elp.elpPenStyle; - logpen.lopnWidth.x = elp.elpWidth; + EXTLOGPEN *elp; + INT size = GetObjectW( hpen, 0, NULL ); + + if (!size) return 0; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( hpen, size, elp ); + /* FIXME: add support for user style pens */ + logpen.lopnStyle = elp->elpPenStyle; + logpen.lopnWidth.x = elp->elpWidth; logpen.lopnWidth.y = 0; - logpen.lopnColor = elp.elpColor; + logpen.lopnColor = elp->elpColor; + + HeapFree( GetProcessHeap(), 0, elp ); } index = MFDRV_CreatePenIndirect( dev, hpen, &logpen ); diff --git a/dlls/wineps/pen.c b/dlls/wineps/pen.c index 6944635..60e41ac 100644 --- a/dlls/wineps/pen.c +++ b/dlls/wineps/pen.c @@ -44,16 +44,21 @@ HPEN PSDRV_SelectPen( PSDRV_PDEVICE *phy if (!GetObjectW( hpen, sizeof(logpen), &logpen )) { /* must be an extended pen */ - EXTLOGPEN elp; - if (!GetObjectW( hpen, sizeof(elp), &elp )) - { - FIXME("extended pen %p not supported\n", hpen); - return 0; - } - logpen.lopnStyle = elp.elpPenStyle; - logpen.lopnWidth.x = elp.elpWidth; + EXTLOGPEN *elp; + INT size = GetObjectW( hpen, 0, NULL ); + + if (!size) return 0; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( hpen, size, elp ); + /* FIXME: add support for user style pens */ + logpen.lopnStyle = elp->elpPenStyle; + logpen.lopnWidth.x = elp->elpWidth; logpen.lopnWidth.y = 0; - logpen.lopnColor = elp.elpColor; + logpen.lopnColor = elp->elpColor; + + HeapFree( GetProcessHeap(), 0, elp ); } TRACE("hpen = %p colour = %08lx\n", hpen, logpen.lopnColor); diff --git a/dlls/x11drv/pen.c b/dlls/x11drv/pen.c index 26cffce..c0af04e 100644 --- a/dlls/x11drv/pen.c +++ b/dlls/x11drv/pen.c @@ -41,16 +41,21 @@ HPEN X11DRV_SelectPen( X11DRV_PDEVICE *p if (!GetObjectW( hpen, sizeof(logpen), &logpen )) { /* must be an extended pen */ - EXTLOGPEN elp; - if (!GetObjectW( hpen, sizeof(elp), &elp )) - { - FIXME("extended pen %p not supported\n", hpen); - return 0; - } - logpen.lopnStyle = elp.elpPenStyle; - logpen.lopnWidth.x = elp.elpWidth; + EXTLOGPEN *elp; + INT size = GetObjectW( hpen, 0, NULL ); + + if (!size) return 0; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( hpen, size, elp ); + /* FIXME: add support for user style pens */ + logpen.lopnStyle = elp->elpPenStyle; + logpen.lopnWidth.x = elp->elpWidth; logpen.lopnWidth.y = 0; - logpen.lopnColor = elp.elpColor; + logpen.lopnColor = elp->elpColor; + + HeapFree( GetProcessHeap(), 0, elp ); } physDev->pen.style = logpen.lopnStyle & PS_STYLE_MASK;

1 0

H. Verbeet : wined3d: Use OpenGL fragment programs when available.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 76c469e5a4bbfc164af953c9630a7b0b4da28a9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76c469e5a4bbfc164af953c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 8 23:52:45 2006 +0000 wined3d: Use OpenGL fragment programs when available. --- dlls/wined3d/drawprim.c | 134 +++++++++++++++++++++++++++++++---------------- 1 files changed, 87 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=76c469e5a4bbfc164af…

1 0

H. Verbeet : wined3d: Remove an incorrect FIXME.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 86b9041c0c5133e4ce2f6b2d40be1e8006510dad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86b9041c0c5133e4ce2f6b2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 8 23:52:29 2006 +0000 wined3d: Remove an incorrect FIXME. --- dlls/wined3d/drawprim.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 37d7453..6d0c282 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1817,13 +1817,6 @@ UINT numberOfvertices, UINT numberOfIndi drawStridedFast(iface, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx); - /* check for any errors */ - glGetIntegerv( GL_PROGRAM_ERROR_POSITION_ARB, &errPos ); - if (errPos != -1) { - FIXME("HW VertexShader Error at position %d: %s\n", - errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); - } - /* disable any attribs */ if(((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->declaredArrays) { GLint maxAttribs;

1 0

H. Verbeet : wined3d: Enable color fixups for vertex shaders.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 008c6a00b97c7687b903fa4f22325642d4a6ab45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=008c6a00b97c7687b903fa4… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 8 23:51:33 2006 +0000 wined3d: Enable color fixups for vertex shaders. --- dlls/wined3d/vertexshader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 12960ae..000a1aa 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -969,6 +969,10 @@ inline static void vshader_program_add_p strcat(hwLine, tmpReg); break; case D3DSPR_INPUT: + if (reg == This->arrayUsageMap[WINED3DSHADERDECLUSAGE_DIFFUSE] + || reg == This->arrayUsageMap[WINED3DSHADERDECLUSAGE_SPECULAR]) { + is_color = TRUE; + } /* if the attributes come in as named dcl's then use a named vertex (called namedVertexN) */ if (This->namedArrays) { sprintf(tmpReg, "namedVertex%lu", reg);

1 0

H. Verbeet : wined3d: Minor vshader_program_add_param cleanup.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 21d62ed1f1b6cb7cfc2ffbc9a2f63174a6a5f267 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21d62ed1f1b6cb7cfc2ffbc… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 8 23:51:18 2006 +0000 wined3d: Minor vshader_program_add_param cleanup. - In vshader_program_add_param, pass a pointer to the shader object instead of individual parameters. - In vshader_program_add_param, rename input to is_input to make it clearer what the parameter does. - Fix a typo & cleanup a comment. --- dlls/wined3d/vertexshader.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index f444ca7..12960ae 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -948,13 +948,14 @@ inline static void vshader_program_add_i } } -inline static void vshader_program_add_param(const DWORD param, int input, int is_color, char *hwLine, BOOL namedArrays, CHAR constantsUsedBitmap[]) { - /*static const char* rastout_reg_names[] = { "oPos", "oFog", "oPts" }; */ +inline static void vshader_program_add_param(IWineD3DVertexShaderImpl *This, const DWORD param, BOOL is_input, char *hwLine) { + /* oPos, oFog and oPts in D3D */ static const char* hwrastout_reg_names[] = { "result.position", "result.fogcoord", "result.pointsize" }; DWORD reg = param & 0x00001FFF; DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT); char tmpReg[255]; + BOOL is_color = FALSE; if ((param & D3DSP_SRCMOD_MASK) == D3DSPSM_NEG) { strcat(hwLine, " -"); @@ -969,7 +970,7 @@ inline static void vshader_program_add_p break; case D3DSPR_INPUT: /* if the attributes come in as named dcl's then use a named vertex (called namedVertexN) */ - if (namedArrays) { + if (This->namedArrays) { sprintf(tmpReg, "namedVertex%lu", reg); } else { /* otherwise the input is on a numbered attribute so use opengl numbered attributes */ @@ -979,9 +980,9 @@ inline static void vshader_program_add_p break; case D3DSPR_CONST: /* FIXME: some constants are named so we need a constants map*/ - if (constantsUsedBitmap[reg] == VS_CONSTANT_CONSTANT) { + if (This->constantsUsedBitmap[reg] == VS_CONSTANT_CONSTANT) { if (param & D3DVS_ADDRMODE_RELATIVE) { - FIXME("Relitive addressing not expected for a named constant %lu\n", reg); + FIXME("Relative addressing not expected for a named constant %lu\n", reg); } sprintf(tmpReg, "const%lu", reg); } else { @@ -1013,7 +1014,7 @@ inline static void vshader_program_add_p break; } - if (!input) { + if (!is_input) { vshader_program_add_output_param_swizzle(param, is_color, hwLine); } else { vshader_program_add_input_param_swizzle(param, is_color, hwLine); @@ -1560,7 +1561,7 @@ inline static VOID IWineD3DVertexShaderI char tmpChar[80]; ++pToken; sprintf(tmpLine, "ATTRIB "); - vshader_program_add_param(*pToken, 0, 0, tmpLine, This->namedArrays, This->constantsUsedBitmap); + vshader_program_add_param(This, *pToken, FALSE, tmpLine); sprintf(tmpChar," = %s", attribName); strcat(tmpLine, tmpChar); strcat(tmpLine,";\n"); @@ -1612,12 +1613,12 @@ inline static VOID IWineD3DVertexShaderI } } if (curOpcode->num_params > 0) { - vshader_program_add_param(*pToken, 0, 0, tmpLine, This->namedArrays, This->constantsUsedBitmap); + vshader_program_add_param(This, *pToken, FALSE, tmpLine); ++pToken; for (i = 1; i < curOpcode->num_params; ++i) { strcat(tmpLine, ","); - vshader_program_add_param(*pToken, 1, 0, tmpLine, This->namedArrays, This->constantsUsedBitmap); + vshader_program_add_param(This, *pToken, TRUE, tmpLine); ++pToken; } }

1 0

Francois Gouget : oleaut32: Reorder a few functions to avoid forward declaractions.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 74b6aba2169f7e44765ac602a605cd5e84b094ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74b6aba2169f7e44765ac60… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 8 12:54:36 2006 +0100 oleaut32: Reorder a few functions to avoid forward declaractions. --- dlls/oleaut32/olepicture.c | 299 ++++++++++++++++++++++---------------------- 1 files changed, 150 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=74b6aba2169f7e44765…

1 0

Stefan Dösinger : wined3d: Use WINED3DPRESENT_PARAMETERS in IWineD3DSwapChain::GetPresentParameters.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 6104c676130798906d7291c4b1c5ffb4e96cae8f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6104c676130798906d7291c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Mar 9 00:49:11 2006 +0100 wined3d: Use WINED3DPRESENT_PARAMETERS in IWineD3DSwapChain::GetPresentParameters. --- dlls/d3d9/swapchain.c | 18 ++++++++++++++++-- dlls/wined3d/swapchain.c | 18 +++++++++++++++--- include/wine/wined3d_interface.h | 2 +- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index e3c7707..abb8ba2 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -120,8 +120,22 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_G HRESULT WINAPI IDirect3DSwapChain9Impl_GetPresentParameters(LPDIRECT3DSWAPCHAIN9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; - FIXME("(%p) : inplement using WINED3DPRESENT_PARAMERS\n", This); - return IWineD3DSwapChain_GetPresentParameters(This->wineD3DSwapChain, pPresentationParameters); + WINED3DPRESENT_PARAMETERS winePresentParameters; + TRACE("(%p)->(%p): Relay\n", This, pPresentationParameters); + winePresentParameters.BackBufferWidth = &pPresentationParameters->BackBufferWidth; + winePresentParameters.BackBufferHeight = &pPresentationParameters->BackBufferHeight; + winePresentParameters.BackBufferFormat = (WINED3DFORMAT *) &pPresentationParameters->BackBufferFormat; + winePresentParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; + winePresentParameters.MultiSampleType = &pPresentationParameters->MultiSampleType; + winePresentParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; + winePresentParameters.SwapEffect = &pPresentationParameters->SwapEffect; + winePresentParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; + winePresentParameters.Windowed = &pPresentationParameters->Windowed; + winePresentParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; + winePresentParameters.Flags = &pPresentationParameters->Flags; + winePresentParameters.FullScreen_RefreshRateInHz = &pPresentationParameters->FullScreen_RefreshRateInHz; + winePresentParameters.PresentationInterval = &pPresentationParameters->PresentationInterval; + return IWineD3DSwapChain_GetPresentParameters(This->wineD3DSwapChain, &winePresentParameters); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 02a8d2e..05dee94 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -434,10 +434,22 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Get return D3D_OK; } -HRESULT WINAPI IWineD3DSwapChainImpl_GetPresentParameters(IWineD3DSwapChain *iface, D3DPRESENT_PARAMETERS *pPresentationParameters) { +HRESULT WINAPI IWineD3DSwapChainImpl_GetPresentParameters(IWineD3DSwapChain *iface, WINED3DPRESENT_PARAMETERS *pPresentationParameters) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; - FIXME("(%p) : copy\n", This); - memcpy(pPresentationParameters, &This->presentParms, sizeof(D3DPRESENT_PARAMETERS)); + TRACE("(%p)\n", This); + *pPresentationParameters->BackBufferWidth = This->presentParms.BackBufferWidth; + *pPresentationParameters->BackBufferHeight = This->presentParms.BackBufferHeight; + *pPresentationParameters->BackBufferFormat = This->presentParms.BackBufferFormat; + *pPresentationParameters->BackBufferCount = This->presentParms.BackBufferCount; + *pPresentationParameters->MultiSampleType = This->presentParms.MultiSampleType; + *pPresentationParameters->MultiSampleQuality = This->presentParms.MultiSampleQuality; + *pPresentationParameters->SwapEffect = This->presentParms.SwapEffect; + *pPresentationParameters->hDeviceWindow = This->presentParms.hDeviceWindow; + *pPresentationParameters->Windowed = This->presentParms.Windowed; + *pPresentationParameters->EnableAutoDepthStencil = This->presentParms.EnableAutoDepthStencil; + *pPresentationParameters->Flags = This->presentParms.Flags; + *pPresentationParameters->FullScreen_RefreshRateInHz = This->presentParms.FullScreen_RefreshRateInHz; + *pPresentationParameters->PresentationInterval = This->presentParms.PresentationInterval; return D3D_OK; } diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index c37ac00..0a4ffa9 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1290,7 +1290,7 @@ DECLARE_INTERFACE_(IWineD3DSwapChain,IWi STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IWineD3DSurface **ppBackBuffer) PURE; STDMETHOD(GetRasterStatus)(THIS_ D3DRASTER_STATUS *pRasterStatus) PURE; STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE *pMode) PURE; - STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS *pPresentationParameters) PURE; + STDMETHOD(GetPresentParameters)(THIS_ WINED3DPRESENT_PARAMETERS *pPresentationParameters) PURE; STDMETHOD(SetGammaRamp)(THIS_ DWORD Flags, const D3DGAMMARAMP *pRamp) PURE; STDMETHOD(GetGammaRamp)(THIS_ D3DGAMMARAMP *pRamp) PURE; };

1 0

Mike McCormack : user: The height of a ListBox item can be no more than MAXBYTE.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: abf3a570afbd506c08d344d5bae38e40e193c56e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=abf3a570afbd506c08d344d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 9 14:22:30 2006 +0900 user: The height of a ListBox item can be no more than MAXBYTE. --- dlls/user/listbox.c | 3 +++ dlls/user/tests/listbox.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/user/listbox.c b/dlls/user/listbox.c index e40cc80..ca4c4d4 100644 --- a/dlls/user/listbox.c +++ b/dlls/user/listbox.c @@ -1187,6 +1187,9 @@ static LRESULT LISTBOX_GetItemHeight( LB */ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BOOL repaint ) { + if (height > MAXBYTE) + return -1; + if (!height) height = 1; if (descr->style & LBS_OWNERDRAWVARIABLE) diff --git a/dlls/user/tests/listbox.c b/dlls/user/tests/listbox.c index 7f22412..8b02b71 100644 --- a/dlls/user/tests/listbox.c +++ b/dlls/user/tests/listbox.c @@ -390,6 +390,45 @@ static void test_selection(void) DestroyWindow(hLB); } +static void test_listbox_height(void) +{ + HWND hList; + int r, id; + + hList = CreateWindow( "ListBox", "list test", 0, + 1, 1, 600, 100, NULL, NULL, NULL, NULL ); + ok( hList != NULL, "failed to create listbox\n"); + + id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + ok( id == 0, "item id wrong\n"); + + r = SendMessage( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 20, 0 )); + ok( r == 0, "send message failed\n"); + + r = SendMessage(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "height wrong\n"); + + r = SendMessage( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0, 30 )); + ok( r == -1, "send message failed\n"); + + r = SendMessage(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "height wrong\n"); + + r = SendMessage( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0x100, 0 )); + ok( r == -1, "send message failed\n"); + + r = SendMessage(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 20, "height wrong\n"); + + r = SendMessage( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0xff, 0 )); + ok( r == 0, "send message failed\n"); + + r = SendMessage(hList, LB_GETITEMHEIGHT, 0, 0 ); + ok( r == 0xff, "height wrong\n"); + + DestroyWindow( hList ); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -463,4 +502,5 @@ START_TEST(listbox) check_item_height(); test_ownerdraw(); test_selection(); + test_listbox_height(); }

1 0

Mike McCormack : msi: Remove some unnecessary indent.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: fe8cd388127433cd162ca29b68fff48d086ddb5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe8cd388127433cd162ca29… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 9 14:21:37 2006 +0900 msi: Remove some unnecessary indent. --- dlls/msi/action.c | 129 ++++++++++++++++++++++++++--------------------------- 1 files changed, 64 insertions(+), 65 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9f342e6..60907a9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2557,92 +2557,91 @@ static UINT ACTION_ProcessComponents(MSI rc = MSIREG_OpenComponents(&hkey); if (rc != ERROR_SUCCESS) - goto end; - + return rc; + squash_guid(package->ProductCode,squished_pc); ui_progress(package,1,COMPONENT_PROGRESS_VALUE,1,0); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { + MSIRECORD * uirow; + ui_progress(package,2,0,0,0); - if (comp->ComponentId) - { - MSIRECORD * uirow; + if (!comp->ComponentId) + continue; - squash_guid(comp->ComponentId,squished_cc); + squash_guid(comp->ComponentId,squished_cc); - msi_free(comp->FullKeypath); - comp->FullKeypath = resolve_keypath( package, comp ); + msi_free(comp->FullKeypath); + comp->FullKeypath = resolve_keypath( package, comp ); - /* do the refcounting */ - ACTION_RefCountComponent( package, comp ); + /* do the refcounting */ + ACTION_RefCountComponent( package, comp ); - TRACE("Component %s (%s), Keypath=%s, RefCount=%i\n", + TRACE("Component %s (%s), Keypath=%s, RefCount=%i\n", debugstr_w(comp->Component), debugstr_w(squished_cc), - debugstr_w(comp->FullKeypath), + debugstr_w(comp->FullKeypath), comp->RefCount); - /* - * Write the keypath out if the component is to be registered - * and delete the key if the component is to be deregistered - */ - if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL)) - { - rc = RegCreateKeyW(hkey,squished_cc,&hkey2); - if (rc != ERROR_SUCCESS) - continue; + /* + * Write the keypath out if the component is to be registered + * and delete the key if the component is to be deregistered + */ + if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL)) + { + rc = RegCreateKeyW(hkey,squished_cc,&hkey2); + if (rc != ERROR_SUCCESS) + continue; - if (comp->FullKeypath) - { - msi_reg_set_val_str( hkey2, squished_pc, comp->FullKeypath ); + if (!comp->FullKeypath) + continue; - if (comp->Attributes & msidbComponentAttributesPermanent) - { - static const WCHAR szPermKey[] = - { '0','0','0','0','0','0','0','0','0','0','0','0', - '0','0','0','0','0','0','0','0','0','0','0','0', - '0','0','0','0','0','0','0','0',0}; + msi_reg_set_val_str( hkey2, squished_pc, comp->FullKeypath ); - msi_reg_set_val_str( hkey2, szPermKey, comp->FullKeypath ); - } - - RegCloseKey(hkey2); - - /* UI stuff */ - uirow = MSI_CreateRecord(3); - MSI_RecordSetStringW(uirow,1,package->ProductCode); - MSI_RecordSetStringW(uirow,2,comp->ComponentId); - MSI_RecordSetStringW(uirow,3,comp->FullKeypath); - ui_actiondata(package,szProcessComponents,uirow); - msiobj_release( &uirow->hdr ); - } - } - else if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT)) + if (comp->Attributes & msidbComponentAttributesPermanent) { - DWORD res; + static const WCHAR szPermKey[] = + { '0','0','0','0','0','0','0','0','0','0','0','0', + '0','0','0','0','0','0','0','0','0','0','0','0', + '0','0','0','0','0','0','0','0',0 }; - rc = RegOpenKeyW(hkey,squished_cc,&hkey2); - if (rc != ERROR_SUCCESS) - continue; - - RegDeleteValueW(hkey2,squished_pc); - - /* if the key is empty delete it */ - res = RegEnumKeyExW(hkey2,0,NULL,0,0,NULL,0,NULL); - RegCloseKey(hkey2); - if (res == ERROR_NO_MORE_ITEMS) - RegDeleteKeyW(hkey,squished_cc); - - /* UI stuff */ - uirow = MSI_CreateRecord(2); - MSI_RecordSetStringW(uirow,1,package->ProductCode); - MSI_RecordSetStringW(uirow,2,comp->ComponentId); - ui_actiondata(package,szProcessComponents,uirow); - msiobj_release( &uirow->hdr ); + msi_reg_set_val_str( hkey2, szPermKey, comp->FullKeypath ); } + + RegCloseKey(hkey2); + + /* UI stuff */ + uirow = MSI_CreateRecord(3); + MSI_RecordSetStringW(uirow,1,package->ProductCode); + MSI_RecordSetStringW(uirow,2,comp->ComponentId); + MSI_RecordSetStringW(uirow,3,comp->FullKeypath); + ui_actiondata(package,szProcessComponents,uirow); + msiobj_release( &uirow->hdr ); + } + else if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_ABSENT)) + { + DWORD res; + + rc = RegOpenKeyW(hkey,squished_cc,&hkey2); + if (rc != ERROR_SUCCESS) + continue; + + RegDeleteValueW(hkey2,squished_pc); + + /* if the key is empty delete it */ + res = RegEnumKeyExW(hkey2,0,NULL,0,0,NULL,0,NULL); + RegCloseKey(hkey2); + if (res == ERROR_NO_MORE_ITEMS) + RegDeleteKeyW(hkey,squished_cc); + + /* UI stuff */ + uirow = MSI_CreateRecord(2); + MSI_RecordSetStringW(uirow,1,package->ProductCode); + MSI_RecordSetStringW(uirow,2,comp->ComponentId); + ui_actiondata(package,szProcessComponents,uirow); + msiobj_release( &uirow->hdr ); } } -end: RegCloseKey(hkey); return rc; }

1 0

Mike McCormack : msi: Make sure to run tests for MsiEvaluateCondition.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 0b9960a1f9925936713d62e208cdfad6b63e3cf9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b9960a1f9925936713d62e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 9 14:20:53 2006 +0900 msi: Make sure to run tests for MsiEvaluateCondition. --- dlls/msi/tests/package.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a1370f7..af01d91 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -326,7 +326,7 @@ static void test_gettargetpath_bad(void) MsiCloseHandle( hpkg ); } -void test_settargetpath_bad(void) +static void test_settargetpath_bad(void) { MSIHANDLE hpkg; UINT r; @@ -349,7 +349,7 @@ void test_settargetpath_bad(void) MsiCloseHandle( hpkg ); } -void test_condition(void) +static void test_condition(void) { MSICONDITION r; MSIHANDLE hpkg; @@ -801,4 +801,5 @@ START_TEST(package) test_gettargetpath_bad(); test_settargetpath_bad(); test_props(); + test_condition(); }

1 0

Jacek Caban : mshtml: Added beginning of getAttribute implementation.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 2c06b800b196887c287b6b2babb09edd989ec598 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c06b800b196887c287b6b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 08:35:58 2006 +0100 mshtml: Added beginning of getAttribute implementation. --- dlls/mshtml/htmlelem.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index eb5f913..f08c578 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -142,9 +142,33 @@ static HRESULT WINAPI HTMLElement_getAtt LONG lFlags, VARIANT *AttributeValue) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%s %08lx %p)\n", This, debugstr_w(strAttributeName), lFlags, - AttributeValue); - return E_NOTIMPL; + nsAString attr_str; + nsAString value_str; + const PRUnichar *value; + nsresult nsres; + HRESULT hres = S_OK; + + WARN("(%p)->(%s %08lx %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); + + nsAString_Init(&attr_str, strAttributeName); + nsAString_Init(&value_str, NULL); + + nsres = nsIDOMHTMLElement_GetAttribute(This->nselem, &attr_str, &value_str); + nsAString_Finish(&attr_str); + + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&value_str, &value, NULL); + V_VT(AttributeValue) = VT_BSTR; + V_BSTR(AttributeValue) = SysAllocString(value);; + TRACE("attr_value=%s\n", debugstr_w(V_BSTR(AttributeValue))); + }else { + ERR("GetAttribute failed: %08lx\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&value_str); + + return hres; } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName,

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement implementation.
by Alexandre Julliard 09 Mar '06

09 Mar '06

Module: wine Branch: refs/heads/master Commit: 26b9c5e022f0ea05b903f7f3583c9ef2a6f64132 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26b9c5e022f0ea05b903f7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 9 00:20:19 2006 +0100 mshtml: Added IHTMLBodyElement implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmlbody.c | 448 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlelem.c | 5 dlls/mshtml/mshtml_private.h | 1 dlls/mshtml/nsiface.idl | 20 ++ 5 files changed, 474 insertions(+), 1 deletions(-) create mode 100644 dlls/mshtml/htmlbody.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=26b9c5e022f0ea05b90…

1 0

tools/. winapi_stats.php
by Jeremy Newman 08 Mar '06

08 Mar '06

ChangeSet ID: 23479 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2006/03/08 13:16:01 Modified files: . : winapi_stats.php Log message: Francois Gouget <fgouget(a)free.fr> Ignore winex11.drv since it is a Wine-specific dll. Patch: http://cvs.winehq.org/patch.py?id=23479 Old revision New revision Changes Path 1.10 1.11 +2 -1 tools/winapi_stats.php Index: tools/winapi_stats.php diff -u -p tools/winapi_stats.php:1.10 tools/winapi_stats.php:1.11 --- tools/winapi_stats.php:1.10 8 Mar 2006 19:16: 1 -0000 +++ tools/winapi_stats.php 8 Mar 2006 19:16: 1 -0000 @@ -78,7 +78,8 @@ WHERE module in ( "winenas.drv", "wineoss.drv", "wineps", -"wineps16.drv" +"wineps16.drv", +"winex11.drv" )'); // perform query on data in temp table

1 0

tools/. csgrep
by Jeremy Newman 08 Mar '06

08 Mar '06

ChangeSet ID: 23478 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2006/03/08 13:14:55 Modified files: . : csgrep Log message: Francois Gouget <fgouget(a)free.fr> Tiny spelling fix. Patch: http://cvs.winehq.org/patch.py?id=23478 Old revision New revision Changes Path 1.3 1.4 +1 -1 tools/csgrep Index: tools/csgrep diff -u -p tools/csgrep:1.3 tools/csgrep:1.4 --- tools/csgrep:1.3 8 Mar 2006 19:14:55 -0000 +++ tools/csgrep 8 Mar 2006 19:14:55 -0000 @@ -57,7 +57,7 @@ guess will be provided (e.g. 95 -> 1995, time portion is missing, it is taken as 00:00:00. The <match> is either a string, or a regular expression. A regular -expression starts with '~'. For the time being, a string can not +expression starts with '~'. For the time being, a string cannot start with '~'. The regex language is close to Perl 5. For more information, read: http://www.python.org/doc/current/lib/re-syntax.html

1 0

Huw Davies : opengl32: Implement wglUseFontOutlines.
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: 4eb4546f21698e283c8fd8af1de61ec84b61d761 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4eb4546f21698e283c8fd8a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 7 13:55:35 2006 +0000 opengl32: Implement wglUseFontOutlines. --- configure | 3 - configure.ac | 2 dlls/opengl32/opengl32.spec | 2 dlls/opengl32/wgl.c | 231 ++++++++++++++++++++++++++++++++++++++++++- include/config.h.in | 3 + 5 files changed, 235 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4eb4546f21698e283c8…

1 0

Juan Lang : crypt32: Implement CertGetValidUsages.
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: 89b3191c7c5173f09898ba80ba760507a1eda03e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89b3191c7c5173f09898ba8… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Mar 7 18:29:18 2006 -0800 crypt32: Implement CertGetValidUsages. --- dlls/crypt32/cert.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 1 2 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 1b38c40..52b8ce1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -572,3 +572,144 @@ BOOL WINAPI CertRemoveEnhancedKeyUsageId } return ret; } + +BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, + int *cNumOIDSs, LPSTR *rghOIDs, DWORD *pcbOIDs) +{ + BOOL ret = TRUE; + DWORD i, cbOIDs = 0; + BOOL allUsagesValid = TRUE; + CERT_ENHKEY_USAGE validUsages = { 0, NULL }; + + TRACE("(%ld, %p, %p, %p, %ld)\n", cCerts, *rghCerts, cNumOIDSs, + rghOIDs, *pcbOIDs); + + for (i = 0; ret && i < cCerts; i++) + { + CERT_ENHKEY_USAGE usage; + DWORD size = sizeof(usage); + + ret = CertGetEnhancedKeyUsage(rghCerts[i], 0, &usage, &size); + /* Success is deliberately ignored: it implies all usages are valid */ + if (!ret && GetLastError() == ERROR_MORE_DATA) + { + PCERT_ENHKEY_USAGE pUsage = CryptMemAlloc(size); + + allUsagesValid = FALSE; + if (pUsage) + { + ret = CertGetEnhancedKeyUsage(rghCerts[i], 0, pUsage, &size); + if (ret) + { + if (!validUsages.cUsageIdentifier) + { + DWORD j; + + cbOIDs = pUsage->cUsageIdentifier * sizeof(LPSTR); + validUsages.cUsageIdentifier = pUsage->cUsageIdentifier; + for (j = 0; j < validUsages.cUsageIdentifier; j++) + cbOIDs += lstrlenA(pUsage->rgpszUsageIdentifier[j]) + + 1; + validUsages.rgpszUsageIdentifier = + CryptMemAlloc(cbOIDs); + if (validUsages.rgpszUsageIdentifier) + { + LPSTR nextOID = (LPSTR) + ((LPBYTE)validUsages.rgpszUsageIdentifier + + validUsages.cUsageIdentifier * sizeof(LPSTR)); + + for (j = 0; j < validUsages.cUsageIdentifier; j++) + { + validUsages.rgpszUsageIdentifier[j] = nextOID; + lstrcpyA(validUsages.rgpszUsageIdentifier[j], + pUsage->rgpszUsageIdentifier[j]); + nextOID += lstrlenA(nextOID) + 1; + } + } + else + ret = FALSE; + } + else + { + DWORD j, k, validIndexes = 0, numRemoved = 0; + + /* Merge: build a bitmap of all the indexes of + * validUsages.rgpszUsageIdentifier that are in pUsage. + */ + for (j = 0; j < pUsage->cUsageIdentifier; j++) + { + for (k = 0; k < validUsages.cUsageIdentifier; k++) + { + if (!strcmp(pUsage->rgpszUsageIdentifier[j], + validUsages.rgpszUsageIdentifier[k])) + { + validIndexes |= (1 << k); + break; + } + } + } + /* Merge by removing from validUsages those that are + * not in the bitmap. + */ + for (j = 0; j < validUsages.cUsageIdentifier; j++) + { + if (!(validIndexes & (1 << j))) + { + if (j < validUsages.cUsageIdentifier - 1) + { + memcpy(&validUsages.rgpszUsageIdentifier[j], + &validUsages.rgpszUsageIdentifier[j + + numRemoved + 1], + (validUsages.cUsageIdentifier - numRemoved + - j - 1) * sizeof(LPSTR)); + cbOIDs -= lstrlenA( + validUsages.rgpszUsageIdentifier[j]) + 1 + + sizeof(LPSTR); + numRemoved++; + } + else + validUsages.cUsageIdentifier--; + } + } + } + } + CryptMemFree(pUsage); + } + else + ret = FALSE; + } + } + if (ret) + { + if (allUsagesValid) + { + *cNumOIDSs = -1; + *pcbOIDs = 0; + } + else + { + if (!rghOIDs || *pcbOIDs < cbOIDs) + { + *pcbOIDs = cbOIDs; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPSTR nextOID = (LPSTR)((LPBYTE)rghOIDs + + validUsages.cUsageIdentifier * sizeof(LPSTR)); + + *pcbOIDs = cbOIDs; + *cNumOIDSs = validUsages.cUsageIdentifier; + for (i = 0; i < validUsages.cUsageIdentifier; i++) + { + rghOIDs[i] = nextOID; + lstrcpyA(nextOID, validUsages.rgpszUsageIdentifier[i]); + nextOID += lstrlenA(nextOID) + 1; + } + } + } + } + CryptMemFree(validUsages.rgpszUsageIdentifier); + return ret; +} diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 7d40394..4fc11b3 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -56,6 +56,7 @@ @ stdcall CertGetNameStringW(ptr long long ptr ptr long) @ stub CertGetPublicKeyLength @ stub CertGetSubjectCertificateFromStore +@ stdcall CertGetValidUsages(long ptr ptr ptr ptr) @ stub CertIsRDNAttrsInCertificateName @ stdcall CertNameToStrA(long ptr long ptr long) @ stdcall CertNameToStrW(long ptr long ptr long)

1 0

Stefan Dösinger : wined3d: Add D3DLOCK_* types to wined3d_types.h.
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: 851bdfb5e0ba3bf3b06122688fba82ad0729407a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=851bdfb5e0ba3bf3b061226… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Mar 8 00:11:28 2006 +0100 wined3d: Add D3DLOCK_* types to wined3d_types.h. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/volume.c | 2 +- include/wine/wined3d_types.h | 7 +++++++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 409d5cb..b621ffd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5719,7 +5719,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Copy if (srcWidth == destWidth && srcHeight == destHeight) { D3DLOCKED_RECT lrSrc; D3DLOCKED_RECT lrDst; - IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, NULL, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, NULL, WINED3DLOCK_READONLY); IWineD3DSurface_LockRect(pDestinationSurface, &lrDst, NULL, 0L); TRACE("Locked src and dst, Direct copy as surfaces are equal, w=%d, h=%d\n", srcWidth, srcHeight); @@ -5759,7 +5759,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Copy copyperline = ((r->right - r->left) * bytesPerPixel); } - IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, r, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, r, WINED3DLOCK_READONLY); dest_rect.left = p->x; dest_rect.top = p->y; dest_rect.right = p->x + (r->right - r->left); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index bf5bc54..37d7453 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -2150,7 +2150,7 @@ void drawPrimitive(IWineD3DDevice *iface if (primCounter >= 0) { D3DLOCKED_RECT r; char buffer[80]; - IWineD3DSurface_LockRect(This->renderTarget, &r, NULL, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(This->renderTarget, &r, NULL, WINED3DLOCK_READONLY); sprintf(buffer, "/tmp/backbuffer_%ld.tga", primCounter); TRACE("Saving screenshot %s\n", buffer); IWineD3DSurface_SaveSnapshot(This->renderTarget, buffer); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cb1ab99..02d8a7e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -469,7 +469,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR } } - } else if (WINED3DUSAGE_RENDERTARGET & This->resource.usage && !(Flags&D3DLOCK_DISCARD)) { /* render surfaces */ + } else if (WINED3DUSAGE_RENDERTARGET & This->resource.usage && !(Flags&WINED3DLOCK_DISCARD)) { /* render surfaces */ GLint prev_store; GLint prev_read; @@ -631,7 +631,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR FIXME("unsupported locking to surface surf@%p usage(%lu)\n", This, This->resource.usage); } - if (Flags & (D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_READONLY)) { + if (Flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY)) { /* Don't dirtify */ } else { IWineD3DBaseTexture *pBaseTexture; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 151ade3..d253e3c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -191,7 +191,7 @@ HRESULT WINAPI IWineD3DVolumeImpl_LockBo This->lockedBox.Back = pBox->Back; } - if (Flags & (D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_READONLY)) { + if (Flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY)) { /* Don't dirtify */ } else { /** diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 75a9ee1..fc5ba17 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -906,4 +906,11 @@ typedef enum _WINED3DDECLUSAGE { #define WINED3DDEVCAPS_RTPATCHHANDLEZERO 0x000800000 #define WINED3DDEVCAPS_NPATCHES 0x001000000 +#define WINED3DLOCK_READONLY 0x0010 +#define WINED3DLOCK_NOSYSLOCK 0x0800 +#define WINED3DLOCK_NOOVERWRITE 0x1000 +#define WINED3DLOCK_DISCARD 0x2000 +#define WINED3DLOCK_DONOTWAIT 0x4000 +#define WINED3DLOCK_NO_DIRTY_UPDATE 0x8000 + #endif

1 0

Jacek Caban : mshtml: Added get_name and get_value implementation of IHTMLTextAreaElement interface .
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: 6fafc22930e6ecc8978ca249ccbff9335fdcfdce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6fafc22930e6ecc8978ca24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 7 23:11:09 2006 +0100 mshtml: Added get_name and get_value implementation of IHTMLTextAreaElement interface. --- dlls/mshtml/htmltextarea.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 257194a..2c86c88 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -149,8 +149,26 @@ static HRESULT WINAPI HTMLTextAreaElemen static HRESULT WINAPI HTMLTextAreaElement_get_value(IHTMLTextAreaElement *iface, BSTR *p) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString value_str; + const PRUnichar *value; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&value_str, NULL); + + nsres = nsIDOMHTMLTextAreaElement_GetValue(This->nstextarea, &value_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&value_str, &value, NULL); + *p = SysAllocString(value); + }else { + ERR("GetValue failed: %08lx\n", nsres); + } + + nsAString_Finish(&value_str); + + TRACE("%s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLTextAreaElement_put_name(IHTMLTextAreaElement *iface, BSTR v) @@ -163,8 +181,26 @@ static HRESULT WINAPI HTMLTextAreaElemen static HRESULT WINAPI HTMLTextAreaElement_get_name(IHTMLTextAreaElement *iface, BSTR *p) { HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + const PRUnichar *name; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + + nsres = nsIDOMHTMLTextAreaElement_GetName(This->nstextarea, &name_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&name_str, &name, NULL); + *p = SysAllocString(name); + }else { + ERR("GetName failed: %08lx\n", nsres); + } + + nsAString_Finish(&name_str); + + TRACE("%s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLTextAreaElement_put_status(IHTMLTextAreaElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added get_name and get_value implementation of IHTMLSelectElement interface .
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: 4ac4246fd5435b02b042588bc1cbed4ef796bb9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ac4246fd5435b02b042588… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 7 23:11:41 2006 +0100 mshtml: Added get_name and get_value implementation of IHTMLSelectElement interface. --- dlls/mshtml/htmlselect.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index c5550a0..0efd769 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -170,8 +170,26 @@ static HRESULT WINAPI HTMLSelectElement_ static HRESULT WINAPI HTMLSelectElement_get_name(IHTMLSelectElement *iface, BSTR *p) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + const PRUnichar *name; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + + nsres = nsIDOMHTMLSelectElement_GetName(This->nsselect, &name_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&name_str, &name, NULL); + *p = SysAllocString(name); + }else { + ERR("GetName failed: %08lx\n", nsres); + } + + nsAString_Finish(&name_str); + + TRACE("name=%s\n", debugstr_w(name)); + return S_OK; } static HRESULT WINAPI HTMLSelectElement_get_options(IHTMLSelectElement *iface, IDispatch **p) @@ -226,8 +244,26 @@ static HRESULT WINAPI HTMLSelectElement_ static HRESULT WINAPI HTMLSelectElement_get_value(IHTMLSelectElement *iface, BSTR *p) { HTMLSelectElement *This = HTMLSELECT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString value_str; + const PRUnichar *value; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&value_str, NULL); + + nsres = nsIDOMHTMLSelectElement_GetValue(This->nsselect, &value_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&value_str, &value, NULL); + *p = SysAllocString(value); + }else { + ERR("GetValue failed: %08lx\n", nsres); + } + + nsAString_Finish(&value_str); + + TRACE("value=%s\n", debugstr_w(value)); + return S_OK; } static HRESULT WINAPI HTMLSelectElement_put_disabled(IHTMLSelectElement *iface, VARIANT_BOOL v)

1 0

Jacek Caban : mshtml: Added get_type, get_value, get_name and get_checked
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: 92ff0e5019bbf6d052c496fb34b64e2e6976c7dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92ff0e5019bbf6d052c496f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 7 23:10:45 2006 +0100 mshtml: Added get_type, get_value, get_name and get_checked implementation of IHTMLInputElement interface. --- dlls/mshtml/htmlinput.c | 83 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 75 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 56b6ba9..85be481 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -142,8 +142,26 @@ static HRESULT WINAPI HTMLInputElement_p static HRESULT WINAPI HTMLInputElement_get_type(IHTMLInputElement *iface, BSTR *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString type_str; + const PRUnichar *type; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&type_str, NULL); + nsres = nsIDOMHTMLInputElement_GetType(This->nsinput, &type_str); + + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&type_str, &type, NULL); + *p = SysAllocString(type); + }else { + ERR("GetType failed: %08lx\n", nsres); + } + + nsAString_Finish(&type_str); + + TRACE("type=%s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_value(IHTMLInputElement *iface, BSTR v) @@ -156,8 +174,26 @@ static HRESULT WINAPI HTMLInputElement_p static HRESULT WINAPI HTMLInputElement_get_value(IHTMLInputElement *iface, BSTR *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString value_str; + const PRUnichar *value; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&value_str, NULL); + + nsres = nsIDOMHTMLInputElement_GetValue(This->nsinput, &value_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&value_str, &value, NULL); + *p = SysAllocString(value); + }else { + ERR("GetValue failed: %08lx\n", nsres); + } + + nsAString_Finish(&value_str); + + TRACE("value=%s\n", debugstr_w(value)); + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_name(IHTMLInputElement *iface, BSTR v) @@ -170,8 +206,27 @@ static HRESULT WINAPI HTMLInputElement_p static HRESULT WINAPI HTMLInputElement_get_name(IHTMLInputElement *iface, BSTR *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + const PRUnichar *name; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + + nsres = nsIDOMHTMLInputElement_GetName(This->nsinput, &name_str); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&name_str, &name, NULL); + *p = SysAllocString(name); + }else { + ERR("GetName failed: %08lx\n", nsres); + return E_FAIL; + } + + nsAString_Finish(&name_str); + + TRACE("name=%s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_status(IHTMLInputElement *iface, VARIANT_BOOL v) @@ -345,8 +400,20 @@ static HRESULT WINAPI HTMLInputElement_p static HRESULT WINAPI HTMLInputElement_get_checked(IHTMLInputElement *iface, VARIANT_BOOL *p) { HTMLInputElement *This = HTMLINPUT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + PRBool checked; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLInputElement_GetChecked(This->nsinput, &checked); + if(NS_FAILED(nsres)) { + ERR("GetChecked failed: %08lx\n", nsres); + return E_FAIL; + } + + *p = checked ? VARIANT_TRUE : VARIANT_FALSE; + TRACE("checked=%x\n", *p); + return S_OK; } static HRESULT WINAPI HTMLInputElement_put_border(IHTMLInputElement *iface, VARIANT v)

1 0

Peter Åstrand : comctl32: LISTVIEW_InsertItemT should accept iItem < 0, when using sorted lists.
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: c5552a694b07e2dea0b788717bb696b8b765f9bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c5552a694b07e2dea0b7887… Author: Peter Åstrand <astrand(a)cendio.se> Date: Tue Mar 7 14:07:49 2006 +0100 comctl32: LISTVIEW_InsertItemT should accept iItem < 0, when using sorted lists. --- dlls/comctl32/listview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9210e8d..cab119a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6211,7 +6211,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW if (infoPtr->dwStyle & LVS_OWNERDATA) return infoPtr->nItemCount++; /* make sure it's an item, and not a subitem; cannot insert a subitem */ - if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iSubItem) return -1; + if (!lpLVItem || lpLVItem->iSubItem) return -1; if (!is_assignable_item(lpLVItem, infoPtr->dwStyle)) return -1; @@ -6224,6 +6224,8 @@ static INT LISTVIEW_InsertItemT(LISTVIEW is_sorted = (infoPtr->dwStyle & (LVS_SORTASCENDING | LVS_SORTDESCENDING)) && !(infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (LPSTR_TEXTCALLBACKW != lpLVItem->pszText); + if (lpLVItem->iItem < 0 && !is_sorted) return -1; + nItem = is_sorted ? infoPtr->nItemCount : min(lpLVItem->iItem, infoPtr->nItemCount); TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems );

1 0

Hans Leidekker : mscms: Add tests for EnumColorProfiles{A,W}.
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: 1d491aedba0b28f984f921568a84667745b0745e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d491aedba0b28f984f9215… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Mar 7 16:52:35 2006 +0100 mscms: Add tests for EnumColorProfiles{A,W}. --- dlls/mscms/tests/profile.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 8c7d0aa..0e30f1e 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -1,7 +1,7 @@ /* * Tests for color profile functions * - * Copyright 2004, 2005 Hans Leidekker + * Copyright 2004, 2005, 2006 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -42,6 +42,8 @@ static BOOL (WINAPI *pGetColorProfil static BOOL (WINAPI *pGetCountColorProfileElements)(HPROFILE,PDWORD); static BOOL (WINAPI *pGetStandardColorSpaceProfileA)(PCSTR,DWORD,PSTR,PDWORD); static BOOL (WINAPI *pGetStandardColorSpaceProfileW)(PCWSTR,DWORD,PWSTR,PDWORD); +static BOOL (WINAPI *pEnumColorProfilesA)(PCSTR,PENUMTYPEA,PBYTE,PDWORD,PDWORD); +static BOOL (WINAPI *pEnumColorProfilesW)(PCWSTR,PENUMTYPEW,PBYTE,PDWORD,PDWORD); static BOOL (WINAPI *pInstallColorProfileA)(PCSTR,PCSTR); static BOOL (WINAPI *pInstallColorProfileW)(PCWSTR,PCWSTR); static BOOL (WINAPI *pIsColorProfileTagPresent)(HPROFILE,TAGTYPE,PBOOL); @@ -69,6 +71,8 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( GetCountColorProfileElements ) GETFUNCPTR( GetStandardColorSpaceProfileA ) GETFUNCPTR( GetStandardColorSpaceProfileW ) + GETFUNCPTR( EnumColorProfilesA ) + GETFUNCPTR( EnumColorProfilesW ) GETFUNCPTR( InstallColorProfileA ) GETFUNCPTR( InstallColorProfileW ) GETFUNCPTR( IsColorProfileTagPresent ) @@ -701,6 +705,102 @@ static void test_GetStandardColorSpacePr } } +static void test_EnumColorProfilesA(void) +{ + BOOL ret; + DWORD size, number; + ENUMTYPEA record; + BYTE buffer[MAX_PATH]; + + /* Parameter checks */ + + size = sizeof(buffer); + memset( &record, 0, sizeof(ENUMTYPEA) ); + + record.dwSize = sizeof(ENUMTYPEA); + record.dwVersion = ENUM_TYPE_VERSION; + record.dwFields |= ET_DATACOLORSPACE; + record.dwDataColorSpace = SPACE_RGB; + + ret = pEnumColorProfilesA( machine, &record, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesA() succeeded (%ld)\n", GetLastError() ); + + ret = pEnumColorProfilesA( NULL, NULL, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesA() succeeded (%ld)\n", GetLastError() ); + + ret = pEnumColorProfilesA( NULL, &record, buffer, NULL, &number ); + ok( !ret, "EnumColorProfilesA() succeeded (%ld)\n", GetLastError() ); + + if (standardprofile) + { + ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + ok( ret, "EnumColorProfilesA() failed (%ld)\n", GetLastError() ); + } + + size = 0; + + ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesA() succeeded (%ld)\n", GetLastError() ); + + /* Functional checks */ + + if (standardprofile) + { + size = sizeof(buffer); + + ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); + ok( ret, "EnumColorProfilesA() failed (%ld)\n", GetLastError() ); + } +} + +static void test_EnumColorProfilesW(void) +{ + BOOL ret; + DWORD size, number; + ENUMTYPEW record; + BYTE buffer[MAX_PATH * sizeof(WCHAR)]; + + /* Parameter checks */ + + size = sizeof(buffer); + memset( &record, 0, sizeof(ENUMTYPEW) ); + + record.dwSize = sizeof(ENUMTYPEW); + record.dwVersion = ENUM_TYPE_VERSION; + record.dwFields |= ET_DATACOLORSPACE; + record.dwDataColorSpace = SPACE_RGB; + + ret = pEnumColorProfilesW( machineW, &record, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesW() succeeded (%ld)\n", GetLastError() ); + + ret = pEnumColorProfilesW( NULL, NULL, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesW() succeeded (%ld)\n", GetLastError() ); + + ret = pEnumColorProfilesW( NULL, &record, buffer, NULL, &number ); + ok( !ret, "EnumColorProfilesW() succeeded (%ld)\n", GetLastError() ); + + if (standardprofileW) + { + ret = pEnumColorProfilesW( NULL, &record, buffer, &size, NULL ); + ok( ret, "EnumColorProfilesW() failed (%ld)\n", GetLastError() ); + } + + size = 0; + + ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); + ok( !ret, "EnumColorProfilesW() succeeded (%ld)\n", GetLastError() ); + + /* Functional checks */ + + if (standardprofileW) + { + size = sizeof(buffer); + + ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); + ok( ret, "EnumColorProfilesW() failed (%ld)\n", GetLastError() ); + } +} + static void test_InstallColorProfileA(void) { BOOL ret; @@ -1250,6 +1350,9 @@ START_TEST(profile) test_GetStandardColorSpaceProfileA(); test_GetStandardColorSpaceProfileW(); + test_EnumColorProfilesA(); + test_EnumColorProfilesW(); + test_InstallColorProfileA(); test_InstallColorProfileW();

1 0

Hans Leidekker : mscms: Implement EnumColorProfiles{A,W}.
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: 05b073da0d10111fac00548946de3104b5be7823 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=05b073da0d10111fac00548… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Mar 7 16:50:17 2006 +0100 mscms: Implement EnumColorProfiles{A,W}. --- dlls/mscms/profile.c | 411 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mscms/stub.c | 16 -- include/icm.h | 20 ++ 3 files changed, 430 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=05b073da0d10111fac0…

1 0

Dmitry Timoshkov : fonts: Install fonts in $(datadir)/wine/fonts.
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: f1a08352673985a965eb205abd0d8632aedc4bca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1a08352673985a965eb205… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 7 22:17:49 2006 +0800 fonts: Install fonts in $(datadir)/wine/fonts. --- fonts/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 59aa6e9..e1b71f9 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = .. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none -fontdir = $(datadir)/fonts/wine +fontdir = $(datadir)/wine/fonts BITMAP_FONTS = \ coue1255.fon \

1 0

Alexandre Julliard : dlls: Added a default install-lib rule for dlls that don't have one.
by Alexandre Julliard 08 Mar '06

08 Mar '06

Module: wine Branch: refs/heads/master Commit: cc3d4d3df34ed7da0aade5a4b6e3ad926ac93b3c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc3d4d3df34ed7da0aade5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 11:31:50 2006 +0100 dlls: Added a default install-lib rule for dlls that don't have one. --- dlls/Makeimplib.rules.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 4c11ab0..4d93ee7 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -27,6 +27,8 @@ install install-dev:: $(MODULE) $(MKINSTALLDIRS) $(DESTDIR)$(dlldir) $(INSTALL_DATA) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) +install-lib:: + uninstall:: $(RM) $(DESTDIR)$(dlldir)/$(MODULE)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2006