Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • wine/wine
  • rbernon/wine
  • stefan/wine
  • FireBurn/wine
  • alesliehughes/wine
  • zhiyi/wine
  • huw/wine
  • jsikorski/wine
  • hmc/wine
  • dadangnh/wine
  • epo/wine
  • dlesho/wine
  • DarkShadow44/wine
  • iamahuman/wine
  • jacek/wine
  • mstorsjo/wine
  • gofman/wine
  • alexhenrie/wine
  • giomasce/wine
  • tclem/wine
  • besentv/wine
  • dlehman25/wine
  • aeikum/wine
  • cdavis5e/wine
  • sbaars/wine
  • baskanov/wine
  • pperdigao/wine
  • DavidHusicka/wine
  • DadSchoorse/wine
  • gverm/wine
  • bshanks/wine
  • gonzoMD/wine
  • Mystral/wine
  • tmatthies/wine
  • zlice/wine
  • AndreRH/wine
  • madewokherd/wine
  • zfigura/wine
  • fgouget/wine
  • nsivov/wine
  • ElementalWarrior/wine
  • piotr/wine
  • timozuccarello/wine
  • DavidCurtiss/wine
  • cmcadams/wine
  • davidebeatrici/wine
  • hans/wine
  • insn/wine
  • danrm/wine
  • jklemann/wine
  • saedo/wine
  • sgwaki/wine
  • puetzk/wine
  • bernhardu/wine
  • ReDress/wine
  • jlucfarias/wine
  • sloper42/wine
  • ivyl/wine
  • zhui/wine
  • julliard/wine
  • ClearlyClaire/wine
  • Alexander-Wilms/wine
  • rndtrash/wine
  • redmcg/wine
  • jkfloris/wine
  • maljaf/wine
  • Tuupertunut/wine
  • bsjeon/wine
  • tati/wine
  • whydoubt/wine
  • doitsujin/wine
  • shaunren/wine
  • szanni/wine
  • tobi.goergens/wine-cabinet-patch
  • winspool/wine
  • olivierfrdierick/wine
  • linkmauve/wine
  • jin-king1/wine
  • yeyeshun/wine
  • sulix/wine
  • bgc/wine
  • fanwenjie/wine
  • IncubusRK/wine
  • js6pak/wine
  • AurimasF/wine
  • etaash.mathamsetty/wine
  • hverbeet/wine
  • Fox2Code/wine
  • jhol/wine
  • jrueger/wine
  • afrantzis/wine
  • lauri.kentta/wine
  • ehoover/wine
  • cdenton/wine
  • jkloetzke/wine
  • baryluk/wine
  • restet/wine-personal
  • orudge/wine
  • Gcenx/wine
  • mstefani/wine
  • hibbsncc1701/wine
  • jchw/wine
  • moceap/wine
  • Skryptonyte/wine
  • marzent/wine
  • msmeissn/wine
  • learn-more/wine
  • logos128/wine
  • xe/wine
  • florian-kuebler/wine
  • eason329/wine
  • gang65/wine
  • binarymaster/wine
  • nbosio1001/wine
  • sh.owais95/wine
  • yaoyuan.0553/wine
  • AnthonyLaurienti/wine
  • mivanchev/wine
  • Hi-Angel/wine
  • vt/wine
  • wyrquill/wine
  • waynus/wine
  • wuliande/wine
  • yao.yuan.wn/wine
  • K1K1/wine
  • lukehutch1027/wine
  • etang-cw/wine
  • Josueblanco/wine
  • jplotz/wine
  • j20001970/wine
  • jsm174/wine
  • aricstewart/wine
  • uncoveryoureyestheresnosun/wine
  • VitorRamos/wine
  • 0e4ef622/wine
  • tj4048750/wine
  • xantares/wine
  • maxfigura/wine
  • sanane/wine
  • juniorjr9345/wine
  • lucaspereira1234/wine
  • gerald/wine
  • lepemiguel32/wine
  • caibb2018/wine
  • CNB_Kevin/wine
  • thc13/wine
  • jaihysc/wine
  • youngsecurity/wine
  • chendeqiang1024/wine
  • rhendric/wine
  • databoose/wine
  • memory-thrasher/wine
  • salman.tajik22/wine
  • CowFroggers/wine
  • kbdharun/wine
  • dreamer/wine
  • babyjoey711/wine
  • ripxorip/wine
  • PSzczepanski1996/wine
  • steveshe006/wine
  • joshua/wine
  • cmccarthy/wine
  • tomjansen/wine
  • sonyps5201314/wine
  • katelynnking4281/wine
  • dhary686/wine
  • mathematician/wine
  • rhabacker/wine
  • steveschnepp/wine
  • nekotekina/wine
  • Aaron1011/wine
  • catsout/wine
  • kasper93/wine
  • beef331/wine
  • ESD/wine
  • sarosib/wine
  • ghurmcardash/wine
  • AMZN-hgoffin/wine
  • gtmikw/wine
  • Keming/wine
  • dpjh747-gl/wine
  • tzluo/wine
  • rfz/wine
  • illia.a.polishchuk/wine
  • new_kleth/wine
  • serkan-maker/wine
  • w-flo/wine
  • mikayahlevi/wine
  • nulleve/wine
  • pgruebele/wine
  • athiele/wine
  • paparaha4/wine
  • novenary/wine
  • Plavil/wine
  • longjunyu/wine
  • chrisli/wine
  • samkottler/wine
  • danielzgtg/wine
  • twcassel/wine
  • guo/wine
  • didier31/wine
  • Zhaoyi/wine
  • twhitehead/wine
  • svyatpro/wine
  • infyquest/wine-iq-devel
  • sebres/wine
  • endrift/wine
  • zhengbl/wine
  • joelikeyan/wine
  • IsaacMarovitz/wine
  • LouiseTheGoldenGoddess/wine
  • SergeGautherie/wine
  • Klittiklatsch/wine
  • ldhacker/wine
  • dk1006498/wine
  • ishitatsuyuki/wine
  • h3c/wine
  • wincenty.bandyta41/wine
  • ayhankus482/wine
  • q4a/wine
  • mjgarton/wine
  • agusev/wine
  • vovams/wine
  • shardulsb08/wine
  • lylythechosenone/wine
  • artemist/wine
  • dropbear/wine
  • Cherser-s/wine
  • smayr/wine
  • loveptong/wine
  • chendeqiang/wine
  • gaber139/wine
  • shytzedaka/wine
  • ghkmufc/wine
  • TornadoCookie/wine
  • klownwolfman/wine
  • bylaws/wine
  • vitorhnn/wine
  • mide1337/wine
  • mewinkler/wine
  • firelzrd/wine
  • Samsuper/wine
  • kkartaltepe/wine
  • petravion/wine
  • Maaka00524/jacob-wine
  • petrathekat/wine
  • dj/wine
  • liam-middlebrook/wine
  • padolkarlucky/wine
  • maarten/wine
  • yhd986/wine
  • linkmecry/wine
  • tehrantoday/wine
  • xuxin12345/wine
  • dmjc/wine
  • sedwards/wine
  • hanslehnert/wine
  • 3ts75/wine
  • EkaterinePapava/wine
  • lav/wine
  • lygstate/wine
  • mxkrsv/wine
  • xutaxkamay/wine
  • cbialorucki/wine
  • yshui/wine
  • baikaishiuc/wine
  • HuwCampbell/wine
  • llde/wine
  • rockdrilla/wine
  • aidanhs/wine
  • SwimmingTiger/wine
  • fvalasiad/wine
  • zsoltiv/wine
  • mailnew4ster/wine
  • ake.rehnman/wine
  • IDocin/wine
  • dmitry/wine
  • Cthuflu/wine
  • corngood/wine
  • whindsaks/wine
  • telans/wine
  • DmitrySokolov/wine
  • Pospelove/wine
  • ellingtonsantos/wine
  • roro/wine
  • wurenny/wine
  • KokoseiJ/wine
  • amurzeau/wine
  • spazzymoto/wine
  • searchingin/wine
  • marler8997/wine
  • Alcaro/wine
  • aunali1/wine
  • snaccslocc420/wine
  • ajkhoury/wine
  • qsniyg/wine
  • Matheus-TestUser1/wine
  • adamrehn/wine
  • brobston/wine
  • aalyaev/wine
  • thongthai/wine
  • j.bayer1988/wine
  • skitt/wine
  • benben/wine
  • ahmouse15/wine
  • achurch/wine
  • mfaqiri2/wine
  • yseo/wine
  • kingjinni/wine
  • userid0x0/wine
  • titan/wine
  • Komoszek/wine
  • GamzeeRakoon/wine
  • joanluc/wine
  • Alan/wine
  • meshine/wine
  • EBADF/wine
  • vibhavp/wine
  • quininer/wine
  • pawelulita/wine
  • muek2211/wine
  • chenhaoyang/wine
  • nishiyama/wine
  • silviuxgaming/wine
  • nell/wine
  • 29jm/wine
  • arilou/wine
  • Mini-Gaunt/wine
  • DodoGTA/wine
  • davispuh/wine
  • mzent/wine
  • arakmar/wine
  • number201724/wine
  • yhd986/wine-up
  • rpisl/wine
  • zp1/wine-zp-cs-464
  • h0tc0d3/wine
  • Snowiiii/wine
  • gabrielb/wine
  • PureBulb/wine
  • OO/wine
  • Clara/wine
  • Saancreed/wine
  • enolp/wine
  • arthunix/wine
  • halfline/wine
  • carlo-bramini/wine
  • jfmu/wine
  • russelltg/wine
  • ntay/wine
  • YellowOnion/wine
  • niversesu/wine
  • gilvbp/wine
  • tingling0072/wine
  • DandD1517/wine
  • rastos/add-GetAnycastIpAddressTable
  • gnif/wine
  • gibsonpil/wine
  • antenabr2/wine
  • kvashis/wine
  • CKolle/wine
  • kubni/wine
  • ten0s/wine
  • Yvonne8873/wine
  • kurikaesu/wine
  • minggr/wine
  • JohnSebastienNadeau/wine
  • karshnicholas/wine
  • SamB/wine
  • apgrc/wine
  • Samiklom/wine
  • llyyr/wine
  • nberner/wine
  • katharinechui/wine
  • kirill.zhumarin/wine
  • vaxerski/wine
  • infiniteloop/wine
  • K0bin/wine
  • arethusa/wine
  • mrdeathjr28/wine
  • dank_meme/wine
  • dh/wine
  • tuomasjjrasanen/wine
  • mmcdonnell/wine
  • mxnny00/wine-manjaro-arch-compatibility
  • Joan/wine
  • g.mo.alcauter/wine
  • zhenbo_li/wine
  • tsmx/wine
  • xaqumin/wine
  • peterjc123/wine
  • ruslangaripov/wine
  • blyss/wine
  • xanathar/wine
  • michael.bond/wine
  • Quix0r/wine
  • sinisa.susnjar/wine
  • Rapid/wine
  • theli.ua/wine
  • shaun.din/wine
  • zhaohongxin/wine
  • dylan.eskew/wine
  • humbertoperezs991/wine
  • vaevi/wine
  • Riesi/wine
  • francisdb/wine
  • 1480c1/wine
  • trcrsired/wine
  • npatt/wine
  • muhammmadalli/wine9.0
  • Czahrien/wine
  • nilsen.jonas/wine
  • underdogest/wine
  • djordjem/wine
  • frubin/wine
  • LucasChollet/wine
  • lipengfei-loongson/wine
  • JacobCzekalla/wine-fork-jacob
  • omar_elantil/wine
  • lumarel/wine
  • principeagustin/wine
  • gotzl/wine
  • OneTester250376/wine
  • austin987/wine
  • unknown62627/wine
  • navi/wine
  • somedevfox/wine
  • notaz/wine
  • fcasas/wine
  • Asteroz/wine
  • MariusSchiffer/wine
  • kevinrmartinez/wine-devel
  • St1gven/wine
  • maarten256/wine
  • rcstarr87/wine
  • tinozzo123/wine
  • GermanAizek/wine
  • spencerwallace/wine
  • schloegl/wine
  • giuppococco/wine
  • shayan7878/wine
  • N080DY12/wine
  • ralf.habacker/wine
  • oh-ok/wine
  • johnporter/wine
  • Low-power/wine
  • thelande/wine
  • riyu12383/wine
  • kubapet/wine
  • Ivan_83/wine
  • SmithGoll/wine
  • gmesmer/wine
  • akarisu.de/wine
  • jwffrey9046/wine
  • anders/wine
  • markbhasawut/wine
  • dy-tea/wine
  • Benjamin_Loison/wine
  • frmdstryr/wine
  • zzam/wine
  • haydenhestad/wine
  • Deppy04/wine
  • osbre/wine
  • CharlottePabst/wine
  • SunlitTango/wine
  • ritalat/wine
  • AlexeyLushnikov/wine
  • mickdermack/wine
  • s1UMBa/wine
  • huangqinjin/wine
  • caseyr297/wine
  • d1saster/wine
  • ayufdh222/wine
  • janstrakowski/wine
  • petur/wine
  • matheus.venturini/wine-fix-ohm-sign
  • rayrapetyan/wine
  • xiaotong/wine
  • ovarley1/wine
  • dos1/wine
  • BZZZZ/wine
  • joesoroka/wine
  • toadking/wine
  • JoshuaBrest/wine
  • elias/wine
  • michele.dionisio/wine
  • garlett/wine-send-arp
  • eugenemcardle/wine
  • hugwijst/wine
  • whrvt/wine
  • loisgomez/wine
  • ramleejo/wine
  • self/wine
  • fr33z00/wine
  • JoeS209/wine
  • JacKeTUs/wine
  • nak.ak2015/wine
  • morgwai/wine
  • funfunctor/wine
  • donnyjoe/wine
  • sitter/wine
  • atticf/wine
  • xipster/wine
  • sebastian/wine
  • AlexanderWillner/wine
  • yaoyongjie/wine
  • wayne/wine
  • AMark/wine
  • zamaudio/wine
  • TomaszPakula/wine
  • Freakness109/wine
  • amorozov/wine
  • HP/wine
  • danlm/wine
  • rariema/wine
  • Biswa96/wine
  • rlippmann/wine
  • yangkun/wine
  • greyghoster/wine
519 results
Show changes
Commits on Source (457)
Showing with 685 additions and 316 deletions
...@@ -25,6 +25,8 @@ Dimitrie O. Paun <dimi@bigfoot.com> ...@@ -25,6 +25,8 @@ Dimitrie O. Paun <dimi@bigfoot.com>
Dimitrie O. Paun <dimi@lattica.com> Dimitrie O. Paun <dimi@lattica.com>
EA Durbin <eadurbin@freebsd.org> EA Durbin <eadurbin@freebsd.org>
Eduardo García <eduardo.garcia@gmx.com> Eduardo García <eduardo.garcia@gmx.com>
Elizabeth Figura <z.figura12@gmail.com>
Elizabeth Figura <zfigura@codeweavers.com>
Erich Hoover <erich.e.hoover@gmail.com> Erich Hoover <erich.e.hoover@gmail.com>
Erich Hoover <erich.e.hoover@wine-staging.com> Erich Hoover <erich.e.hoover@wine-staging.com>
Erwin Wolff <erwinwolffnl@microformatica.com> Erwin Wolff <erwinwolffnl@microformatica.com>
...@@ -156,7 +158,6 @@ William Poetra Yoga Hadisoesen <williampoetra@yahoo.com> ...@@ -156,7 +158,6 @@ William Poetra Yoga Hadisoesen <williampoetra@yahoo.com>
Won Kyu Park <wkpark@kldp.org> Won Kyu Park <wkpark@kldp.org>
Yuri Kozlov <yuriy.kozlov@gmail.com> Yuri Kozlov <yuriy.kozlov@gmail.com>
Zachary Brown <zac@zacbrown.org> Zachary Brown <zac@zacbrown.org>
Zebediah Figura <zfigura@codeweavers.com>
Zoltan Nagy <nagyzoli@drotposta.hu> Zoltan Nagy <nagyzoli@drotposta.hu>
unidentified <9700584@cs.stadia.fi> unidentified <9700584@cs.stadia.fi>
unidentified <develop@stueben.com> unidentified <develop@stueben.com>
......
This diff is collapsed.
...@@ -381,6 +381,7 @@ Dan Kegel ...@@ -381,6 +381,7 @@ Dan Kegel
Dan Langlois Dan Langlois
Dan Scott Dan Scott
Dan Wolf Dan Wolf
Danyil Blyschak
Darryl Dixon Darryl Dixon
Dave Belanger Dave Belanger
Dave Hawkes Dave Hawkes
...@@ -489,6 +490,7 @@ Ekaterine Papava ...@@ -489,6 +490,7 @@ Ekaterine Papava
Elias Benali Elias Benali
Elias Ross Elias Ross
Elie Morisse Elie Morisse
Elizabeth Figura
Emilio Cobos Álvarez Emilio Cobos Álvarez
Emmanuel Maillard Emmanuel Maillard
Enol Puente Enol Puente
...@@ -560,6 +562,7 @@ Florian Tobias Schandinat ...@@ -560,6 +562,7 @@ Florian Tobias Schandinat
Florian Will Florian Will
Floris Renaud Floris Renaud
Fons Botman Fons Botman
Fotios Valasiadis
Francesco Di Punzio Francesco Di Punzio
Francesco Noferi Francesco Noferi
Francis Beaudet Francis Beaudet
...@@ -610,6 +613,7 @@ Giuseppe Bilotta ...@@ -610,6 +613,7 @@ Giuseppe Bilotta
Gleb Smirnoff Gleb Smirnoff
Glenn Schrader Glenn Schrader
Glenn Wurster Glenn Wurster
Gopal Prasad
Goran Thyni Goran Thyni
Gordon Chaffee Gordon Chaffee
G. Paul Ziemba G. Paul Ziemba
...@@ -685,6 +689,7 @@ Hiroshi Miura ...@@ -685,6 +689,7 @@ Hiroshi Miura
Hiroshi Tanabe Hiroshi Tanabe
Hleb Valoska Hleb Valoska
Hongbo Ni Hongbo Ni
Hongxin Zhao
Howard Abrams Howard Abrams
Howell Tam Howell Tam
Hua Meng Hua Meng
...@@ -1013,6 +1018,7 @@ Kira Backes ...@@ -1013,6 +1018,7 @@ Kira Backes
Kirill Erofeev Kirill Erofeev
Kirill K. Smirnov Kirill K. Smirnov
Kirill Smelkov Kirill Smelkov
Kirill Zhumarin
Kjell Rune Skaaraas Kjell Rune Skaaraas
Klaas van Gend Klaas van Gend
Klaus Layer Klaus Layer
...@@ -1208,6 +1214,7 @@ Micah N Gorrell ...@@ -1208,6 +1214,7 @@ Micah N Gorrell
Michael Abbott Michael Abbott
Michael Abd-El-Malek Michael Abd-El-Malek
Michael Beach Michael Beach
Michael Bond
Michael Cardenas Michael Cardenas
Michael C. Maggio Michael C. Maggio
Michael Cronenworth Michael Cronenworth
...@@ -1420,6 +1427,7 @@ Peter Hawkins ...@@ -1420,6 +1427,7 @@ Peter Hawkins
Peter Hedlund Peter Hedlund
Peter Hunnisett Peter Hunnisett
Peter Ivanyi Peter Ivanyi
Peter Johnson
Peter Lemenkov Peter Lemenkov
Peter MacDonald Peter MacDonald
Peter Mladek Peter Mladek
...@@ -1553,6 +1561,7 @@ Roger Koot ...@@ -1553,6 +1561,7 @@ Roger Koot
Roger Olson Roger Olson
Roger Zoellner Roger Zoellner
Rok Mandeljc Rok Mandeljc
Roland Häder
Rolf Kalbermatter Rolf Kalbermatter
Romain Iehl Romain Iehl
Roman Dadkov Roman Dadkov
...@@ -1890,7 +1899,6 @@ Zachary Brown ...@@ -1890,7 +1899,6 @@ Zachary Brown
Zach Goldberg Zach Goldberg
Zach Gorman Zach Gorman
Zach Smith Zach Smith
Zebediah Figura
Zhangrong Huang Zhangrong Huang
Zhang Shuai Zhang Shuai
Zhan Jianyu Zhan Jianyu
......
...@@ -37,7 +37,6 @@ F: dlls/ntdll/signal_arm* ...@@ -37,7 +37,6 @@ F: dlls/ntdll/signal_arm*
F: programs/winedbg/be_arm* F: programs/winedbg/be_arm*
Audio I/O Audio I/O
P: Andrew Eikum <coldpie@fastmail.com>
P: Huw Davies <huw@codeweavers.com> P: Huw Davies <huw@codeweavers.com>
F: dlls/dsound/ F: dlls/dsound/
F: dlls/mmdevapi/ F: dlls/mmdevapi/
...@@ -66,7 +65,7 @@ P: Henri Verbeet <hverbeet@codeweavers.com> ...@@ -66,7 +65,7 @@ P: Henri Verbeet <hverbeet@codeweavers.com>
F: dlls/d2d*/ F: dlls/d2d*/
Direct3D Direct3D
M: Zebediah Figura <z.figura12@gmail.com> M: Elizabeth Figura <zfigura@codeweavers.com>
M: Jan Sikorski <jsikorski@codeweavers.com> M: Jan Sikorski <jsikorski@codeweavers.com>
P: Henri Verbeet <hverbeet@codeweavers.com> P: Henri Verbeet <hverbeet@codeweavers.com>
P: Stefan Dösinger <stefan@codeweavers.com> P: Stefan Dösinger <stefan@codeweavers.com>
...@@ -106,7 +105,7 @@ F: dlls/dpnet/ ...@@ -106,7 +105,7 @@ F: dlls/dpnet/
F: dlls/dpwsockx/ F: dlls/dpwsockx/
DirectShow DirectShow
M: Zebediah Figura <z.figura12@gmail.com> M: Elizabeth Figura <zfigura@codeweavers.com>
P: Rémi Bernon <rbernon@codeweavers.com> P: Rémi Bernon <rbernon@codeweavers.com>
F: dlls/amstream/ F: dlls/amstream/
F: dlls/devenum/ F: dlls/devenum/
...@@ -159,7 +158,7 @@ M: Marcus Meissner <marcus@jet.franken.de> ...@@ -159,7 +158,7 @@ M: Marcus Meissner <marcus@jet.franken.de>
F: dlls/gphoto2.ds/ F: dlls/gphoto2.ds/
GStreamer multimedia backend GStreamer multimedia backend
M: Zebediah Figura <z.figura12@gmail.com> M: Elizabeth Figura <zfigura@codeweavers.com>
P: Rémi Bernon <rbernon@codeweavers.com> P: Rémi Bernon <rbernon@codeweavers.com>
F: dlls/winegstreamer/ F: dlls/winegstreamer/
...@@ -173,7 +172,7 @@ F: dlls/mouhid.sys/ ...@@ -173,7 +172,7 @@ F: dlls/mouhid.sys/
F: dlls/winehid.sys/ F: dlls/winehid.sys/
HTTP server HTTP server
M: Zebediah Figura <z.figura12@gmail.com> M: Elizabeth Figura <zfigura@codeweavers.com>
F: dlls/httpapi/ F: dlls/httpapi/
F: dlls/http.sys/ F: dlls/http.sys/
...@@ -206,15 +205,10 @@ F: dlls/winexinput.sys/ ...@@ -206,15 +205,10 @@ F: dlls/winexinput.sys/
F: dlls/winmm/joystick.c F: dlls/winmm/joystick.c
F: dlls/xinput*/ F: dlls/xinput*/
Media format conversion
P: Andrew Eikum <coldpie@fastmail.com>
F: dlls/*.acm/
F: dlls/msacm32/
Media Foundation GStreamer backend Media Foundation GStreamer backend
M: Rémi Bernon <rbernon@codeweavers.com> M: Rémi Bernon <rbernon@codeweavers.com>
P: Nikolay Sivov <nsivov@codeweavers.com> P: Nikolay Sivov <nsivov@codeweavers.com>
P: Zebediah Figura <z.figura12@gmail.com> P: Elizabeth Figura <zfigura@codeweavers.com>
F: dlls/mf/tests/transform.c F: dlls/mf/tests/transform.c
F: dlls/winegstreamer/aac_decoder.c F: dlls/winegstreamer/aac_decoder.c
F: dlls/winegstreamer/color_convert.c F: dlls/winegstreamer/color_convert.c
...@@ -238,7 +232,7 @@ F: dlls/vcruntime140_1/ ...@@ -238,7 +232,7 @@ F: dlls/vcruntime140_1/
MSI installers MSI installers
M: Hans Leidekker <hans@codeweavers.com> M: Hans Leidekker <hans@codeweavers.com>
P: Zebediah Figura <z.figura12@gmail.com> P: Elizabeth Figura <zfigura@codeweavers.com>
F: dlls/msi/ F: dlls/msi/
Netstat Netstat
...@@ -288,7 +282,7 @@ P: Huw Davies <huw@codeweavers.com> ...@@ -288,7 +282,7 @@ P: Huw Davies <huw@codeweavers.com>
F: dlls/oleaut32/typelib.c F: dlls/oleaut32/typelib.c
Plug and Play Plug and Play
P: Zebediah Figura <z.figura12@gmail.com> P: Elizabeth Figura <zfigura@codeweavers.com>
F: dlls/newdev/ F: dlls/newdev/
F: dlls/ntoskrnl.exe/pnp.c F: dlls/ntoskrnl.exe/pnp.c
F: dlls/setupapi/devinst.c F: dlls/setupapi/devinst.c
...@@ -310,7 +304,7 @@ F: dlls/riched20/ ...@@ -310,7 +304,7 @@ F: dlls/riched20/
RPC Runtime RPC Runtime
P: Huw Davies <huw@codeweavers.com> P: Huw Davies <huw@codeweavers.com>
P: Zebediah Figura <z.figura12@gmail.com> P: Elizabeth Figura <zfigura@codeweavers.com>
F: dlls/rpcrt4/ F: dlls/rpcrt4/
Theming Theming
...@@ -349,7 +343,7 @@ F: dlls/shdocvw/ ...@@ -349,7 +343,7 @@ F: dlls/shdocvw/
WIDL WIDL
P: Huw Davies <huw@codeweavers.com> P: Huw Davies <huw@codeweavers.com>
P: Rémi Bernon <rbernon@codeweavers.com> P: Rémi Bernon <rbernon@codeweavers.com>
P: Zebediah Figura <z.figura12@gmail.com> P: Elizabeth Figura <zfigura@codeweavers.com>
F: tools/widl/ F: tools/widl/
Windows Imaging Component Windows Imaging Component
...@@ -365,7 +359,7 @@ F: dlls/wbemprox/ ...@@ -365,7 +359,7 @@ F: dlls/wbemprox/
F: dlls/wmiutils/ F: dlls/wmiutils/
Windows Media Format Windows Media Format
M: Zebediah Figura <z.figura12@gmail.com> M: Elizabeth Figura <zfigura@codeweavers.com>
P: Rémi Bernon <rbernon@codeweavers.com> P: Rémi Bernon <rbernon@codeweavers.com>
F: dlls/wmp/ F: dlls/wmp/
F: dlls/wmvcore/ F: dlls/wmvcore/
...@@ -431,7 +425,7 @@ W: https://wiki.winehq.org/StableRules ...@@ -431,7 +425,7 @@ W: https://wiki.winehq.org/StableRules
Staging Branch Staging Branch
M: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> M: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
P: Zebediah Figura <z.figura12@gmail.com> P: Elizabeth Figura <zfigura@codeweavers.com>
P: Paul Gofman <gofmanp@gmail.com> P: Paul Gofman <gofmanp@gmail.com>
P: Erich E. Hoover <erich.e.hoover@wine-staging.com> P: Erich E. Hoover <erich.e.hoover@wine-staging.com>
W: https://wine-staging.com/ W: https://wine-staging.com/
Wine version 9.7 Wine version 9.9
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for Wine 9.7. # Generated by GNU Autoconf 2.71 for Wine 9.9.
# #
# Report bugs to <wine-devel@winehq.org>. # Report bugs to <wine-devel@winehq.org>.
# #
...@@ -611,8 +611,8 @@ MAKEFLAGS= ...@@ -611,8 +611,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='Wine' PACKAGE_NAME='Wine'
PACKAGE_TARNAME='wine' PACKAGE_TARNAME='wine'
PACKAGE_VERSION='9.7' PACKAGE_VERSION='9.9'
PACKAGE_STRING='Wine 9.7' PACKAGE_STRING='Wine 9.9'
PACKAGE_BUGREPORT='wine-devel@winehq.org' PACKAGE_BUGREPORT='wine-devel@winehq.org'
PACKAGE_URL='https://www.winehq.org' PACKAGE_URL='https://www.winehq.org'
   
...@@ -700,6 +700,8 @@ DBUS_LIBS ...@@ -700,6 +700,8 @@ DBUS_LIBS
DBUS_CFLAGS DBUS_CFLAGS
INOTIFY_LIBS INOTIFY_LIBS
INOTIFY_CFLAGS INOTIFY_CFLAGS
ODBC_LIBS
ODBC_CFLAGS
PCSCLITE_LIBS PCSCLITE_LIBS
PCAP_LIBS PCAP_LIBS
WAYLAND_EGL_LIBS WAYLAND_EGL_LIBS
...@@ -945,6 +947,7 @@ with_inotify ...@@ -945,6 +947,7 @@ with_inotify
with_krb5 with_krb5
with_mingw with_mingw
with_netapi with_netapi
with_odbc
with_opencl with_opencl
with_opengl with_opengl
with_osmesa with_osmesa
...@@ -1811,6 +1814,8 @@ EGL_CFLAGS ...@@ -1811,6 +1814,8 @@ EGL_CFLAGS
EGL_LIBS EGL_LIBS
WAYLAND_EGL_CFLAGS WAYLAND_EGL_CFLAGS
WAYLAND_EGL_LIBS WAYLAND_EGL_LIBS
ODBC_CFLAGS
ODBC_LIBS
INOTIFY_CFLAGS INOTIFY_CFLAGS
INOTIFY_LIBS INOTIFY_LIBS
DBUS_CFLAGS DBUS_CFLAGS
...@@ -2397,7 +2402,7 @@ if test "$ac_init_help" = "long"; then ...@@ -2397,7 +2402,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures Wine 9.7 to adapt to many kinds of systems. \`configure' configures Wine 9.9 to adapt to many kinds of systems.
   
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
   
...@@ -2467,7 +2472,7 @@ fi ...@@ -2467,7 +2472,7 @@ fi
   
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of Wine 9.7:";; short | recursive ) echo "Configuration of Wine 9.9:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
   
...@@ -2508,6 +2513,7 @@ Optional Packages: ...@@ -2508,6 +2513,7 @@ Optional Packages:
--without-krb5 do not use krb5 (Kerberos) --without-krb5 do not use krb5 (Kerberos)
--without-mingw do not use the MinGW cross-compiler --without-mingw do not use the MinGW cross-compiler
--without-netapi do not use the Samba NetAPI library --without-netapi do not use the Samba NetAPI library
--without-odbc do not use the ODBC library
--without-opencl do not use OpenCL --without-opencl do not use OpenCL
--without-opengl do not use OpenGL --without-opengl do not use OpenGL
--without-osmesa do not use the OSMesa library --without-osmesa do not use the OSMesa library
...@@ -2643,6 +2649,8 @@ Some influential environment variables: ...@@ -2643,6 +2649,8 @@ Some influential environment variables:
C compiler flags for wayland-egl, overriding pkg-config C compiler flags for wayland-egl, overriding pkg-config
WAYLAND_EGL_LIBS WAYLAND_EGL_LIBS
Linker flags for wayland-egl, overriding pkg-config Linker flags for wayland-egl, overriding pkg-config
ODBC_CFLAGS C compiler flags for odbc, overriding pkg-config
ODBC_LIBS Linker flags for odbc, overriding pkg-config
INOTIFY_CFLAGS INOTIFY_CFLAGS
C compiler flags for libinotify, overriding pkg-config C compiler flags for libinotify, overriding pkg-config
INOTIFY_LIBS INOTIFY_LIBS
...@@ -2770,7 +2778,7 @@ fi ...@@ -2770,7 +2778,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
Wine configure 9.7 Wine configure 9.9
generated by GNU Autoconf 2.71 generated by GNU Autoconf 2.71
   
Copyright (C) 2021 Free Software Foundation, Inc. Copyright (C) 2021 Free Software Foundation, Inc.
...@@ -3221,7 +3229,7 @@ cat >config.log <<_ACEOF ...@@ -3221,7 +3229,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
   
It was created by Wine $as_me 9.7, which was It was created by Wine $as_me 9.9, which was
generated by GNU Autoconf 2.71. Invocation command line was generated by GNU Autoconf 2.71. Invocation command line was
   
$ $0$ac_configure_args_raw $ $0$ac_configure_args_raw
...@@ -4369,6 +4377,13 @@ then : ...@@ -4369,6 +4377,13 @@ then :
fi fi
   
   
# Check whether --with-odbc was given.
if test ${with_odbc+y}
then :
withval=$with_odbc;
fi
# Check whether --with-opencl was given. # Check whether --with-opencl was given.
if test ${with_opencl+y} if test ${with_opencl+y}
then : then :
...@@ -12027,6 +12042,17 @@ case $HOST_ARCH in ...@@ -12027,6 +12042,17 @@ case $HOST_ARCH in
arm|aarch64) arm|aarch64)
test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5 test "x$PE_ARCHS" != x || as_fn_error $? "PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw." "$LINENO" 5
DLLEXT="" ;; DLLEXT="" ;;
*)
if test "x$PE_ARCHS" = "x"
then :
case "x$with_mingw" in
x) as_fn_append wine_notices "|Suitable PE cross-compiler not found, PE files won't be built." ;;
xno) ;;
*) as_fn_error $? "Suitable PE cross-compiler not found, PE files won't be built.
This is an error since --with-mingw was requested." "$LINENO" 5 ;;
esac
fi ;;
esac esac
   
   
...@@ -16588,6 +16614,91 @@ esac ...@@ -16588,6 +16614,91 @@ esac
enable_winscard=${enable_winscard:-no} enable_winscard=${enable_winscard:-no}
fi fi
   
if test "x$with_odbc" != "xno"
then
rm -f conftest.err
if ${ODBC_CFLAGS:+false} :
then :
if test ${PKG_CONFIG+y}
then :
ODBC_CFLAGS=`$PKG_CONFIG --cflags odbc 2>conftest.err`
fi
fi
if ${ODBC_LIBS:+false} :
then :
if test ${PKG_CONFIG+y}
then :
ODBC_LIBS=`$PKG_CONFIG --libs odbc 2>/dev/null`
fi
fi
ODBC_LIBS=${ODBC_LIBS:-"-lodbc"}
printf "%s\n" "$as_me:${as_lineno-$LINENO}: odbc cflags: $ODBC_CFLAGS" >&5
printf "%s\n" "$as_me:${as_lineno-$LINENO}: odbc libs: $ODBC_LIBS" >&5
if test -s conftest.err; then
printf %s "$as_me:${as_lineno-$LINENO}: odbc errors: " >&5
cat conftest.err >&5
fi
rm -f conftest.err
ac_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $ODBC_CFLAGS"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLConnect in -lodbc" >&5
printf %s "checking for SQLConnect in -lodbc... " >&6; }
if test ${ac_cv_lib_odbc_SQLConnect+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_lib_save_LIBS=$LIBS
LIBS="-lodbc $ODBC_LIBS $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
char SQLConnect ();
int
main (void)
{
return SQLConnect ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_odbc_SQLConnect=yes
else $as_nop
ac_cv_lib_odbc_SQLConnect=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_odbc_SQLConnect" >&5
printf "%s\n" "$ac_cv_lib_odbc_SQLConnect" >&6; }
if test "x$ac_cv_lib_odbc_SQLConnect" = xyes
then :
:
else $as_nop
ODBC_LIBS=""
fi
CPPFLAGS=$ac_save_CPPFLAGS
fi
if test "x$ODBC_LIBS" = x
then :
case "x$with_odbc" in
x) as_fn_append wine_notices "|libodbc not found, ODBC won't be supported." ;;
xno) ;;
*) as_fn_error $? "libodbc not found, ODBC won't be supported.
This is an error since --with-odbc was requested." "$LINENO" 5 ;;
esac
enable_odbc32=${enable_odbc32:-no}
fi
if test "x$with_inotify" != "xno" if test "x$with_inotify" != "xno"
then then
rm -f conftest.err rm -f conftest.err
...@@ -18915,62 +19026,6 @@ printf "%s\n" "#define HAVE_LIBPROCSTAT 1" >>confdefs.h ...@@ -18915,62 +19026,6 @@ printf "%s\n" "#define HAVE_LIBPROCSTAT 1" >>confdefs.h
   
fi fi
   
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lodbc" >&5
printf %s "checking for -lodbc... " >&6; }
if test ${ac_cv_lib_soname_odbc+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_soname_save_LIBS=$LIBS
LIBS="-lodbc $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
char SQLConnect ();
int
main (void)
{
return SQLConnect ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
case "$LIBEXT" in
dll) ac_cv_lib_soname_odbc=`$ac_cv_path_LDD conftest.exe | grep "odbc" | sed -e "s/dll.*/dll/"';2,$d'` ;;
dylib) ac_cv_lib_soname_odbc=`$OTOOL -L conftest$ac_exeext | grep "libodbc\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libodbc\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
*) ac_cv_lib_soname_odbc=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libodbc\\.$LIBEXT" | sed -e "s/^.*\\[\\(libodbc\\.$LIBEXT[^ ]*\\)\\].*$/\1/"';2,$d'`
if ${ac_cv_lib_soname_odbc:+false} :
then :
ac_cv_lib_soname_odbc=`$LDD conftest$ac_exeext | grep "libodbc\\.$LIBEXT" | sed -e "s/^.*\(libodbc\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'`
fi ;;
esac
else $as_nop
ac_cv_lib_soname_odbc=
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_soname_save_LIBS
fi
if ${ac_cv_lib_soname_odbc:+false} :
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
printf "%s\n" "not found" >&6; }
printf "%s\n" "#define SONAME_LIBODBC \"libodbc.$LIBEXT\"" >>confdefs.h
else $as_nop
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_odbc" >&5
printf "%s\n" "$ac_cv_lib_soname_odbc" >&6; }
printf "%s\n" "#define SONAME_LIBODBC \"$ac_cv_lib_soname_odbc\"" >>confdefs.h
fi fi
   
if test "x$with_netapi" != "xno" if test "x$with_netapi" != "xno"
...@@ -22418,6 +22473,7 @@ wine_fn_config_makefile dlls/ntprint enable_ntprint ...@@ -22418,6 +22473,7 @@ wine_fn_config_makefile dlls/ntprint enable_ntprint
wine_fn_config_makefile dlls/ntprint/tests enable_tests wine_fn_config_makefile dlls/ntprint/tests enable_tests
wine_fn_config_makefile dlls/objsel enable_objsel wine_fn_config_makefile dlls/objsel enable_objsel
wine_fn_config_makefile dlls/odbc32 enable_odbc32 wine_fn_config_makefile dlls/odbc32 enable_odbc32
wine_fn_config_makefile dlls/odbc32/tests enable_tests
wine_fn_config_makefile dlls/odbcbcp enable_odbcbcp wine_fn_config_makefile dlls/odbcbcp enable_odbcbcp
wine_fn_config_makefile dlls/odbccp32 enable_odbccp32 wine_fn_config_makefile dlls/odbccp32 enable_odbccp32
wine_fn_config_makefile dlls/odbccp32/tests enable_tests wine_fn_config_makefile dlls/odbccp32/tests enable_tests
...@@ -23645,7 +23701,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -23645,7 +23701,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by Wine $as_me 9.7, which was This file was extended by Wine $as_me 9.9, which was
generated by GNU Autoconf 2.71. Invocation command line was generated by GNU Autoconf 2.71. Invocation command line was
   
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -23709,7 +23765,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ ...@@ -23709,7 +23765,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped' ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\ ac_cs_version="\\
Wine config.status 9.7 Wine config.status 9.9
configured by $0, generated by GNU Autoconf 2.71, configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
   
...@@ -24056,6 +24112,8 @@ WAYLAND_EGL_CFLAGS = $WAYLAND_EGL_CFLAGS ...@@ -24056,6 +24112,8 @@ WAYLAND_EGL_CFLAGS = $WAYLAND_EGL_CFLAGS
WAYLAND_EGL_LIBS = $WAYLAND_EGL_LIBS WAYLAND_EGL_LIBS = $WAYLAND_EGL_LIBS
PCAP_LIBS = $PCAP_LIBS PCAP_LIBS = $PCAP_LIBS
PCSCLITE_LIBS = $PCSCLITE_LIBS PCSCLITE_LIBS = $PCSCLITE_LIBS
ODBC_CFLAGS = $ODBC_CFLAGS
ODBC_LIBS = $ODBC_LIBS
INOTIFY_CFLAGS = $INOTIFY_CFLAGS INOTIFY_CFLAGS = $INOTIFY_CFLAGS
INOTIFY_LIBS = $INOTIFY_LIBS INOTIFY_LIBS = $INOTIFY_LIBS
DBUS_CFLAGS = $DBUS_CFLAGS DBUS_CFLAGS = $DBUS_CFLAGS
......
...@@ -42,6 +42,7 @@ AC_ARG_WITH(inotify, AS_HELP_STRING([--without-inotify],[do not use inotify (f ...@@ -42,6 +42,7 @@ AC_ARG_WITH(inotify, AS_HELP_STRING([--without-inotify],[do not use inotify (f
AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)])) AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)]))
AC_ARG_WITH(mingw, AS_HELP_STRING([--without-mingw],[do not use the MinGW cross-compiler])) AC_ARG_WITH(mingw, AS_HELP_STRING([--without-mingw],[do not use the MinGW cross-compiler]))
AC_ARG_WITH(netapi, AS_HELP_STRING([--without-netapi],[do not use the Samba NetAPI library])) AC_ARG_WITH(netapi, AS_HELP_STRING([--without-netapi],[do not use the Samba NetAPI library]))
AC_ARG_WITH(odbc, AS_HELP_STRING([--without-odbc],[do not use the ODBC library]))
AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]),
[if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi]) [if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi])
AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
...@@ -1016,6 +1017,9 @@ case $HOST_ARCH in ...@@ -1016,6 +1017,9 @@ case $HOST_ARCH in
arm|aarch64) arm|aarch64)
test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw.]) test "x$PE_ARCHS" != x || AC_MSG_ERROR([PE cross-compilation is required for $HOST_ARCH, please install clang/llvm-dlltool/lld, or llvm-mingw.])
DLLEXT="" ;; DLLEXT="" ;;
*)
WINE_NOTICE_WITH(mingw,[test "x$PE_ARCHS" = "x"],
[Suitable PE cross-compiler not found, PE files won't be built.]) ;;
esac esac
dnl **** External libraries **** dnl **** External libraries ****
...@@ -1422,6 +1426,16 @@ WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x], ...@@ -1422,6 +1426,16 @@ WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x],
[libpcsclite not found, smart cards won't be supported.], [libpcsclite not found, smart cards won't be supported.],
[enable_winscard]) [enable_winscard])
dnl **** Check for libodbc ****
if test "x$with_odbc" != "xno"
then
WINE_PACKAGE_FLAGS(ODBC,[odbc],[-lodbc],,,
[AC_CHECK_LIB(odbc,SQLConnect,[:],[ODBC_LIBS=""],[$ODBC_LIBS])])
fi
WINE_NOTICE_WITH(odbc,[test "x$ODBC_LIBS" = x],
[libodbc not found, ODBC won't be supported.],
[enable_odbc32])
dnl **** Check for inotify **** dnl **** Check for inotify ****
if test "x$with_inotify" != "xno" if test "x$with_inotify" != "xno"
then then
...@@ -1811,9 +1825,6 @@ then ...@@ -1811,9 +1825,6 @@ then
AC_SUBST(PROCSTAT_LIBS,"-lprocstat")]) AC_SUBST(PROCSTAT_LIBS,"-lprocstat")])
fi fi
dnl **** Check for libodbc ****
WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
dnl **** Check for libnetapi **** dnl **** Check for libnetapi ****
if test "x$with_netapi" != "xno" if test "x$with_netapi" != "xno"
then then
...@@ -2971,6 +2982,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntprint) ...@@ -2971,6 +2982,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntprint)
WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) WINE_CONFIG_MAKEFILE(dlls/ntprint/tests)
WINE_CONFIG_MAKEFILE(dlls/objsel) WINE_CONFIG_MAKEFILE(dlls/objsel)
WINE_CONFIG_MAKEFILE(dlls/odbc32) WINE_CONFIG_MAKEFILE(dlls/odbc32)
WINE_CONFIG_MAKEFILE(dlls/odbc32/tests)
WINE_CONFIG_MAKEFILE(dlls/odbcbcp) WINE_CONFIG_MAKEFILE(dlls/odbcbcp)
WINE_CONFIG_MAKEFILE(dlls/odbccp32) WINE_CONFIG_MAKEFILE(dlls/odbccp32)
WINE_CONFIG_MAKEFILE(dlls/odbccp32/tests) WINE_CONFIG_MAKEFILE(dlls/odbccp32/tests)
......
MODULE = actxprxy.dll MODULE = actxprxy.dll
IMPORTS = uuid oleaut32 ole32 rpcrt4 IMPORTS = uuid oleaut32 ole32 rpcrt4
EXTRAIDLFLAGS = -Oicf
SOURCES = \ SOURCES = \
actxprxy_activscp.idl \ actxprxy_activscp.idl \
actxprxy_comcat.idl \ actxprxy_comcat.idl \
......
@ stub ??0CLexer@@QAE@XZ @ stub -arch=arm ??0CLexer@@QAA@XZ
@ stub ??1CLexer@@QAE@XZ @ stub -arch=i386 ??0CLexer@@QAE@XZ
@ stub -arch=win64 ??0CLexer@@QEAA@XZ
@ stub -arch=arm ??1CLexer@@QAA@XZ
@ stub -arch=i386 ??1CLexer@@QAE@XZ
@ stub -arch=win64 ??1CLexer@@QEAA@XZ
@ stub ADSIPrint @ stub ADSIPrint
@ stub ADsAbandonSearch @ stub ADsAbandonSearch
@ stub ADsCloseSearchHandle @ stub ADsCloseSearchHandle
...@@ -53,11 +57,15 @@ ...@@ -53,11 +57,15 @@
@ stub GetDisplayName @ stub GetDisplayName
@ stub GetDomainDNSNameForDomain @ stub GetDomainDNSNameForDomain
@ stub GetLDAPTypeName @ stub GetLDAPTypeName
@ stub ?GetNextToken@CLexer@@QAEJPAGPAK@Z @ stub -arch=arm ?GetNextToken@CLexer@@QAAJPAGPAK@Z
@ stub -arch=i386 ?GetNextToken@CLexer@@QAEJPAGPAK@Z
@ stub -arch=win64 ?GetNextToken@CLexer@@QEAAJPEAGPEAK@Z
@ stub GetServerAndPort @ stub GetServerAndPort
@ stub GetSyntaxOfAttribute @ stub GetSyntaxOfAttribute
@ stub InitObjectInfo @ stub InitObjectInfo
@ stub ?InitializePath@CLexer@@QAEJPAG@Z @ stub -arch=arm ?InitializePath@CLexer@@QAAJPAG@Z
@ stub -arch=i386 ?InitializePath@CLexer@@QAEJPAG@Z
@ stub -arch=win64 ?InitializePath@CLexer@@QEAAJPEAG@Z
@ stub IsGCNamespace @ stub IsGCNamespace
@ stub LdapAddExtS @ stub LdapAddExtS
@ stub LdapAddS @ stub LdapAddS
...@@ -136,9 +144,15 @@ ...@@ -136,9 +144,15 @@
@ stub SchemaGetSyntaxOfAttribute @ stub SchemaGetSyntaxOfAttribute
@ stub SchemaIsClassAContainer @ stub SchemaIsClassAContainer
@ stub SchemaOpen @ stub SchemaOpen
@ stub ?SetAtDisabler@CLexer@@QAEXH@Z @ stub -arch=arm ?SetAtDisabler@CLexer@@QAAXH@Z
@ stub ?SetExclaimnationDisabler@CLexer@@QAEXH@Z @ stub -arch=i386 ?SetAtDisabler@CLexer@@QAEXH@Z
@ stub ?SetFSlashDisabler@CLexer@@QAEXH@Z @ stub -arch=win64 ?SetAtDisabler@CLexer@@QEAAXH@Z
@ stub -arch=arm ?SetExclaimnationDisabler@CLexer@@QAAXH@Z
@ stub -arch=i386 ?SetExclaimnationDisabler@CLexer@@QAEXH@Z
@ stub -arch=win64 ?SetExclaimnationDisabler@CLexer@@QEAAXH@Z
@ stub -arch=arm ?SetFSlashDisabler@CLexer@@QAAXH@Z
@ stub -arch=i386 ?SetFSlashDisabler@CLexer@@QAEXH@Z
@ stub -arch=win64 ?SetFSlashDisabler@CLexer@@QEAAXH@Z
@ stub SortAndRemoveDuplicateOIDs @ stub SortAndRemoveDuplicateOIDs
@ stub UnMarshallLDAPToLDAPSynID @ stub UnMarshallLDAPToLDAPSynID
@ stub intcmp @ stub intcmp
......
MODULE = amstream.dll MODULE = amstream.dll
IMPORTS = strmiids strmbase uuid ole32 advapi32 ddraw IMPORTS = strmiids strmbase uuid ole32 advapi32 ddraw msvcrt
SOURCES = \ SOURCES = \
amstream_classes.idl \ amstream_classes.idl \
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
*/ */
#pragma makedep regtypelib #pragma makedep regtypelib
#pragma makedep register
import "atliface.idl"; import "atliface.idl";
......
...@@ -2,8 +2,6 @@ MODULE = avifil32.dll ...@@ -2,8 +2,6 @@ MODULE = avifil32.dll
IMPORTLIB = avifil32 IMPORTLIB = avifil32
IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4
EXTRAIDLFLAGS = -Oicf
SOURCES = \ SOURCES = \
acmstream.c \ acmstream.c \
api.c \ api.c \
......
...@@ -2139,9 +2139,9 @@ static NTSTATUS pubkey_set_rsa_pss_params( gnutls_pubkey_t key, gnutls_digest_al ...@@ -2139,9 +2139,9 @@ static NTSTATUS pubkey_set_rsa_pss_params( gnutls_pubkey_t key, gnutls_digest_al
static NTSTATUS key_asymmetric_verify( void *args ) static NTSTATUS key_asymmetric_verify( void *args )
{ {
#ifdef GNUTLS_VERIFY_ALLOW_BROKEN #ifdef GNUTLS_VERIFY_ALLOW_BROKEN
static const unsigned int verify_flags = GNUTLS_VERIFY_ALLOW_BROKEN; unsigned int verify_flags = GNUTLS_VERIFY_ALLOW_BROKEN;
#else #else
static const unsigned int verify_flags = 0; unsigned int verify_flags = 0;
#endif #endif
const struct key_asymmetric_verify_params *params = args; const struct key_asymmetric_verify_params *params = args;
struct key *key = params->key; struct key *key = params->key;
...@@ -2182,8 +2182,12 @@ static NTSTATUS key_asymmetric_verify( void *args ) ...@@ -2182,8 +2182,12 @@ static NTSTATUS key_asymmetric_verify( void *args )
BCRYPT_PKCS1_PADDING_INFO *info = params->padding; BCRYPT_PKCS1_PADDING_INFO *info = params->padding;
if (!info) return STATUS_INVALID_PARAMETER; if (!info) return STATUS_INVALID_PARAMETER;
if (!info->pszAlgId) return STATUS_INVALID_SIGNATURE; if (!info->pszAlgId)
if ((hash_alg = get_digest_from_id(info->pszAlgId)) == GNUTLS_DIG_UNKNOWN) {
hash_alg = GNUTLS_DIG_UNKNOWN;
verify_flags |= GNUTLS_VERIFY_USE_TLS1_RSA;
}
else if ((hash_alg = get_digest_from_id(info->pszAlgId)) == GNUTLS_DIG_UNKNOWN)
{ {
FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) ); FIXME( "hash algorithm %s not supported\n", debugstr_w(info->pszAlgId) );
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
...@@ -2374,12 +2378,13 @@ static NTSTATUS key_asymmetric_sign( void *args ) ...@@ -2374,12 +2378,13 @@ static NTSTATUS key_asymmetric_sign( void *args )
{ {
BCRYPT_PKCS1_PADDING_INFO *pad = params->padding; BCRYPT_PKCS1_PADDING_INFO *pad = params->padding;
if (!pad || !pad->pszAlgId) if (!pad)
{ {
WARN( "padding info not found\n" ); WARN( "padding info not found\n" );
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == GNUTLS_DIG_UNKNOWN) if (!pad->pszAlgId) hash_alg = GNUTLS_DIG_UNKNOWN;
else if ((hash_alg = get_digest_from_id( pad->pszAlgId )) == GNUTLS_DIG_UNKNOWN)
{ {
FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) ); FIXME( "hash algorithm %s not recognized\n", debugstr_w(pad->pszAlgId) );
return STATUS_NOT_SUPPORTED; return STATUS_NOT_SUPPORTED;
......
...@@ -2725,6 +2725,21 @@ static void test_RSA(void) ...@@ -2725,6 +2725,21 @@ static void test_RSA(void)
ret = BCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1); ret = BCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1);
ok(!ret, "BCryptVerifySignature failed: %#lx\n", ret); ok(!ret, "BCryptVerifySignature failed: %#lx\n", ret);
pad.pszAlgId = NULL;
memset(sig, 0, sizeof(sig));
len = 0;
ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1);
ok(!ret, "got %#lx\n", ret);
ok(len == 256, "got %lu\n", len);
pad.pszAlgId = BCRYPT_SHA1_ALGORITHM;
ret = BCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1);
ok(ret == STATUS_INVALID_SIGNATURE, "BCryptVerifySignature failed: %#lx, len %ld\n", ret, len);
pad.pszAlgId = NULL;
ret = BCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1);
ok(!ret, "BCryptVerifySignature failed: %#lx, len %ld\n", ret, len);
pad_pss.pszAlgId = BCRYPT_SHA384_ALGORITHM; pad_pss.pszAlgId = BCRYPT_SHA384_ALGORITHM;
pad_pss.cbSalt = 48; pad_pss.cbSalt = 48;
memset(sig_pss, 0, sizeof(sig_pss)); memset(sig_pss, 0, sizeof(sig_pss));
...@@ -2872,6 +2887,10 @@ static void test_RSA_SIGN(void) ...@@ -2872,6 +2887,10 @@ static void test_RSA_SIGN(void)
ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf2, sizeof(buf2), &size, 0); ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf2, sizeof(buf2), &size, 0);
ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret);
pad.pszAlgId = NULL;
ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1);
ok(ret == STATUS_INVALID_SIGNATURE, "BCryptVerifySignature failed: %#lx\n", ret);
pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; pad.pszAlgId = BCRYPT_SHA1_ALGORITHM;
ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1); ret = BCryptVerifySignature(key, &pad, rsaHash, sizeof(rsaHash), rsaSignature, sizeof(rsaSignature), BCRYPT_PAD_PKCS1);
ok(!ret, "BCryptVerifySignature failed: %#lx\n", ret); ok(!ret, "BCryptVerifySignature failed: %#lx\n", ret);
......
...@@ -4,8 +4,6 @@ IMPORTLIB = combase ...@@ -4,8 +4,6 @@ IMPORTLIB = combase
IMPORTS = advapi32 ole32 user32 gdi32 uuid rpcrt4 IMPORTS = advapi32 ole32 user32 gdi32 uuid rpcrt4
DELAYIMPORTS = oleaut32 DELAYIMPORTS = oleaut32
EXTRAIDLFLAGS = -Oicf
SOURCES = \ SOURCES = \
apartment.c \ apartment.c \
combase.c \ combase.c \
......
...@@ -55,6 +55,7 @@ typedef struct ...@@ -55,6 +55,7 @@ typedef struct
HWND Self; HWND Self;
HWND Notify; HWND Notify;
BOOL Enabled; BOOL Enabled;
HFONT hFont;
IPPART_INFO Part[4]; IPPART_INFO Part[4];
} IPADDRESS_INFO; } IPADDRESS_INFO;
...@@ -269,6 +270,8 @@ static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) ...@@ -269,6 +270,8 @@ static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr)
SetWindowLongPtrW (part->EditHwnd, GWLP_WNDPROC, (DWORD_PTR)part->OrigProc); SetWindowLongPtrW (part->EditHwnd, GWLP_WNDPROC, (DWORD_PTR)part->OrigProc);
} }
if (infoPtr->hFont)
DeleteObject (infoPtr->hFont);
SetWindowLongPtrW (infoPtr->Self, 0, 0); SetWindowLongPtrW (infoPtr->Self, 0, 0);
theme = GetWindowTheme (infoPtr->Self); theme = GetWindowTheme (infoPtr->Self);
CloseThemeData (theme); CloseThemeData (theme);
...@@ -651,6 +654,10 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ...@@ -651,6 +654,10 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
IPADDRESS_SetFocusToField (infoPtr, 0); IPADDRESS_SetFocusToField (infoPtr, 0);
break; break;
case WM_SETFONT:
infoPtr->hFont = (HFONT)wParam;
return 0;
default: default:
if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg))
ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam); ERR("unknown msg %04x, wp %Ix, lp %Ix\n", uMsg, wParam, lParam);
......
...@@ -1711,7 +1711,6 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, ...@@ -1711,7 +1711,6 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message,
case WM_DESTROY: case WM_DESTROY:
TRACE("SysLink Ctrl destruction, hwnd=%p\n", hwnd); TRACE("SysLink Ctrl destruction, hwnd=%p\n", hwnd);
SYSLINK_ClearDoc(infoPtr); SYSLINK_ClearDoc(infoPtr);
if(infoPtr->Font != 0) DeleteObject(infoPtr->Font);
if(infoPtr->LinkFont != 0) DeleteObject(infoPtr->LinkFont); if(infoPtr->LinkFont != 0) DeleteObject(infoPtr->LinkFont);
SetWindowLongPtrW(hwnd, 0, 0); SetWindowLongPtrW(hwnd, 0, 0);
Free (infoPtr); Free (infoPtr);
......
...@@ -115,7 +115,6 @@ static const struct message redraw_listview_seq[] = { ...@@ -115,7 +115,6 @@ static const struct message redraw_listview_seq[] = {
{ WM_NCPAINT, sent|id|defwinproc, 0, 0, HEADER_ID }, { WM_NCPAINT, sent|id|defwinproc, 0, 0, HEADER_ID },
{ WM_ERASEBKGND, sent|id|defwinproc|optional, 0, 0, HEADER_ID }, { WM_ERASEBKGND, sent|id|defwinproc|optional, 0, 0, HEADER_ID },
{ WM_NOTIFY, sent|id|defwinproc, 0, 0, LISTVIEW_ID }, { WM_NOTIFY, sent|id|defwinproc, 0, 0, LISTVIEW_ID },
{ WM_NCPAINT, sent|id|defwinproc, 0, 0, LISTVIEW_ID },
{ WM_ERASEBKGND, sent|id|defwinproc|optional, 0, 0, LISTVIEW_ID }, { WM_ERASEBKGND, sent|id|defwinproc|optional, 0, 0, LISTVIEW_ID },
{ 0 } { 0 }
}; };
...@@ -810,6 +809,8 @@ static HWND create_listview_control(DWORD style) ...@@ -810,6 +809,8 @@ static HWND create_listview_control(DWORD style)
if (!hwnd) return NULL; if (!hwnd) return NULL;
UpdateWindow(hwnd);
oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC,
(LONG_PTR)listview_subclass_proc); (LONG_PTR)listview_subclass_proc);
SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc);
...@@ -833,6 +834,8 @@ static HWND create_listview_controlW(DWORD style, HWND parent) ...@@ -833,6 +834,8 @@ static HWND create_listview_controlW(DWORD style, HWND parent)
if (!hwnd) return NULL; if (!hwnd) return NULL;
UpdateWindow(hwnd);
oldproc = (WNDPROC)SetWindowLongPtrW(hwnd, GWLP_WNDPROC, oldproc = (WNDPROC)SetWindowLongPtrW(hwnd, GWLP_WNDPROC,
(LONG_PTR)listview_subclass_proc); (LONG_PTR)listview_subclass_proc);
SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc);
...@@ -1888,7 +1891,10 @@ static void test_create(BOOL is_version_6) ...@@ -1888,7 +1891,10 @@ static void test_create(BOOL is_version_6)
/* WM_MEASUREITEM should be sent when created with LVS_OWNERDRAWFIXED */ /* WM_MEASUREITEM should be sent when created with LVS_OWNERDRAWFIXED */
flush_sequences(sequences, NUM_MSG_SEQUENCES); flush_sequences(sequences, NUM_MSG_SEQUENCES);
hList = create_listview_control(LVS_OWNERDRAWFIXED | LVS_REPORT); hList = CreateWindowExA(0, WC_LISTVIEWA, NULL,
WS_CHILD | WS_BORDER | WS_VISIBLE | LVS_OWNERDRAWFIXED | LVS_REPORT,
0, 0, 100, 100, hwndparent, NULL, GetModuleHandleA(NULL), NULL);
ok(hList != NULL, "Failed to create ListView window.\n");
ok_sequence(sequences, PARENT_SEQ_INDEX, create_ownerdrawfixed_parent_seq, ok_sequence(sequences, PARENT_SEQ_INDEX, create_ownerdrawfixed_parent_seq,
"created with LVS_OWNERDRAWFIXED|LVS_REPORT - parent seq", FALSE); "created with LVS_OWNERDRAWFIXED|LVS_REPORT - parent seq", FALSE);
DestroyWindow(hList); DestroyWindow(hList);
...@@ -2198,8 +2204,8 @@ static void test_color(void) ...@@ -2198,8 +2204,8 @@ static void test_color(void)
rect.right = rect.bottom = 1; rect.right = rect.bottom = 1;
r = GetUpdateRect(hwnd, &rect, TRUE); r = GetUpdateRect(hwnd, &rect, TRUE);
todo_wine expect(FALSE, r); expect(FALSE, r);
ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); ok(rect.right == 0 && rect.bottom == 0, "got update rectangle %s\n", wine_dbgstr_rect(&rect));
r = ValidateRect(hwnd, NULL); r = ValidateRect(hwnd, NULL);
expect(TRUE, r); expect(TRUE, r);
...@@ -2208,8 +2214,8 @@ static void test_color(void) ...@@ -2208,8 +2214,8 @@ static void test_color(void)
rect.right = rect.bottom = 1; rect.right = rect.bottom = 1;
r = GetUpdateRect(hwnd, &rect, TRUE); r = GetUpdateRect(hwnd, &rect, TRUE);
todo_wine expect(FALSE, r); expect(FALSE, r);
ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); ok(rect.right == 0 && rect.bottom == 0, "got update rectangle %s\n", wine_dbgstr_rect(&rect));
r = ValidateRect(hwnd, NULL); r = ValidateRect(hwnd, NULL);
expect(TRUE, r); expect(TRUE, r);
...@@ -2218,8 +2224,8 @@ static void test_color(void) ...@@ -2218,8 +2224,8 @@ static void test_color(void)
rect.right = rect.bottom = 1; rect.right = rect.bottom = 1;
r = GetUpdateRect(hwnd, &rect, TRUE); r = GetUpdateRect(hwnd, &rect, TRUE);
todo_wine expect(FALSE, r); expect(FALSE, r);
ok(rect.right == 0 && rect.bottom == 0, "got update rectangle\n"); ok(rect.right == 0 && rect.bottom == 0, "got update rectangle %s\n", wine_dbgstr_rect(&rect));
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }
......
...@@ -1160,6 +1160,95 @@ static void test_WM_STYLECHANGED(void) ...@@ -1160,6 +1160,95 @@ static void test_WM_STYLECHANGED(void)
DestroyWindow(parent); DestroyWindow(parent);
} }
static void test_WM_SETFONT(void)
{
HFONT hfont, hfont2;
HWND parent, hwnd;
LOGFONTA lf;
int i, ret;
static const struct
{
const CHAR *class_name;
BOOL use_system_font;
}
tests[] =
{
{ANIMATE_CLASSA, TRUE},
{WC_BUTTONA},
{WC_COMBOBOXA},
{WC_COMBOBOXEXA},
{DATETIMEPICK_CLASSA},
{WC_EDITA},
{WC_HEADERA},
{HOTKEY_CLASSA},
{WC_IPADDRESSA, TRUE},
{WC_LISTBOXA},
{WC_LISTVIEWA},
{MONTHCAL_CLASSA},
{WC_NATIVEFONTCTLA, TRUE},
{WC_PAGESCROLLERA, TRUE},
{PROGRESS_CLASSA},
{REBARCLASSNAMEA},
{WC_STATICA},
{STATUSCLASSNAMEA},
{"SysLink"},
{WC_TABCONTROLA},
{TOOLBARCLASSNAMEA},
{TOOLTIPS_CLASSA},
{TRACKBAR_CLASSA, TRUE},
{WC_TREEVIEWA},
{UPDOWN_CLASSA, TRUE},
{WC_SCROLLBARA, TRUE},
};
parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 100, 100,
0, 0, 0, 0);
ok(parent != NULL, "CreateWindowA failed, error %lu.\n", GetLastError());
for (i = 0; i < ARRAY_SIZE(tests); ++i)
{
winetest_push_context("%s", tests[i].class_name);
hwnd = CreateWindowA(tests[i].class_name, "test", WS_POPUP | WS_VISIBLE, 0, 0, 50, 50, parent,
0, 0, 0);
/* SysLink is unavailable in comctl32 v5 */
if (!hwnd && !lstrcmpA(tests[i].class_name, "SysLink"))
{
winetest_pop_context();
continue;
}
ZeroMemory(&lf, sizeof(lf));
lf.lfWeight = FW_NORMAL;
lf.lfHeight = 20;
lstrcpyA(lf.lfFaceName, "Tahoma");
hfont = CreateFontIndirectA(&lf);
ok(hfont != NULL, "CreateFontIndirectA failed, error %lu.\n", GetLastError());
SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, TRUE);
hfont2 = (HFONT)SendMessageA(hwnd, WM_GETFONT, 0, 0);
if (tests[i].use_system_font)
ok(hfont2 == NULL, "Got unexpected font %p.\n", hfont2);
else
ok(hfont2 == hfont, "Got unexpected font %p.\n", hfont2);
ret = GetObjectA(hfont, sizeof(lf), &lf);
ok(ret == sizeof(lf), "GetObjectA failed, error %lu.\n", GetLastError());
DestroyWindow(hwnd);
ret = GetObjectA(hfont, sizeof(lf), &lf);
if (!lstrcmpA(tests[i].class_name, WC_IPADDRESSA))
ok(ret == 0, "GetObjectA succeeded.\n");
else
ok(ret == sizeof(lf), "GetObjectA failed, error %lu.\n", GetLastError());
winetest_pop_context();
}
DestroyWindow(parent);
}
START_TEST(misc) START_TEST(misc)
{ {
ULONG_PTR ctx_cookie; ULONG_PTR ctx_cookie;
...@@ -1173,6 +1262,7 @@ START_TEST(misc) ...@@ -1173,6 +1262,7 @@ START_TEST(misc)
test_Alloc(); test_Alloc();
test_comctl32_classes(FALSE); test_comctl32_classes(FALSE);
test_WM_STYLECHANGED(); test_WM_STYLECHANGED();
test_WM_SETFONT();
FreeLibrary(hComctl32); FreeLibrary(hComctl32);
...@@ -1188,6 +1278,7 @@ START_TEST(misc) ...@@ -1188,6 +1278,7 @@ START_TEST(misc)
test_WM_THEMECHANGED(); test_WM_THEMECHANGED();
test_WM_SYSCOLORCHANGE(); test_WM_SYSCOLORCHANGE();
test_WM_STYLECHANGED(); test_WM_STYLECHANGED();
test_WM_SETFONT();
unload_v6_module(ctx_cookie, hCtx); unload_v6_module(ctx_cookie, hCtx);
FreeLibrary(hComctl32); FreeLibrary(hComctl32);
......
...@@ -131,6 +131,7 @@ typedef struct ...@@ -131,6 +131,7 @@ typedef struct
COLORREF clrBk; COLORREF clrBk;
COLORREF clrText; COLORREF clrText;
HFONT hFont; HFONT hFont;
HFONT hStatusFont;
HFONT hTitleFont; HFONT hTitleFont;
INT xTrackPos; INT xTrackPos;
INT yTrackPos; INT yTrackPos;
...@@ -194,14 +195,16 @@ TOOLTIPS_InitSystemSettings (TOOLTIPS_INFO *infoPtr) ...@@ -194,14 +195,16 @@ TOOLTIPS_InitSystemSettings (TOOLTIPS_INFO *infoPtr)
infoPtr->clrBk = comctl32_color.clrInfoBk; infoPtr->clrBk = comctl32_color.clrInfoBk;
infoPtr->clrText = comctl32_color.clrInfoText; infoPtr->clrText = comctl32_color.clrInfoText;
DeleteObject (infoPtr->hFont); DeleteObject (infoPtr->hStatusFont);
nclm.cbSize = sizeof(nclm); nclm.cbSize = sizeof(nclm);
SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof(nclm), &nclm, 0); SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof(nclm), &nclm, 0);
infoPtr->hFont = CreateFontIndirectW (&nclm.lfStatusFont); infoPtr->hStatusFont = CreateFontIndirectW (&nclm.lfStatusFont);
DeleteObject (infoPtr->hTitleFont); DeleteObject (infoPtr->hTitleFont);
nclm.lfStatusFont.lfWeight = FW_BOLD; nclm.lfStatusFont.lfWeight = FW_BOLD;
infoPtr->hTitleFont = CreateFontIndirectW (&nclm.lfStatusFont); infoPtr->hTitleFont = CreateFontIndirectW (&nclm.lfStatusFont);
infoPtr->hFont = infoPtr->hStatusFont;
} }
/* Custom draw routines */ /* Custom draw routines */
...@@ -1854,7 +1857,7 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) ...@@ -1854,7 +1857,7 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr)
DeleteObject(infoPtr->hTitleIcon); DeleteObject(infoPtr->hTitleIcon);
/* delete fonts */ /* delete fonts */
DeleteObject (infoPtr->hFont); DeleteObject (infoPtr->hStatusFont);
DeleteObject (infoPtr->hTitleFont); DeleteObject (infoPtr->hTitleFont);
/* free tool tips info data */ /* free tool tips info data */
...@@ -1952,8 +1955,7 @@ TOOLTIPS_SetFont (TOOLTIPS_INFO *infoPtr, HFONT hFont, BOOL redraw) ...@@ -1952,8 +1955,7 @@ TOOLTIPS_SetFont (TOOLTIPS_INFO *infoPtr, HFONT hFont, BOOL redraw)
if(!GetObjectW(hFont, sizeof(lf), &lf)) if(!GetObjectW(hFont, sizeof(lf), &lf))
return 0; return 0;
DeleteObject (infoPtr->hFont); infoPtr->hFont = hFont;
infoPtr->hFont = CreateFontIndirectW(&lf);
DeleteObject (infoPtr->hTitleFont); DeleteObject (infoPtr->hTitleFont);
lf.lfWeight = FW_BOLD; lf.lfWeight = FW_BOLD;
......