- wine-devel - winehq.org

[PATCH] po: Update Finnish translation
by Lauri Kenttä 30 Dec '18

30 Dec '18

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 416 ++++++++++++++++++++++++++----------------------------- 1 file changed, 198 insertions(+), 218 deletions(-) diff --git a/po/fi.po b/po/fi.po index 9220a656bc..2dc9e7d974 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-08-31 07:27+0200\n" +"PO-Revision-Date: 2018-12-30 02:40+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -9052,811 +9052,791 @@ msgstr "Valitse lähde" #: tzres.rc:82 msgid "China Standard Time" -msgstr "" +msgstr "Kiinan normaaliaika" #: tzres.rc:83 msgid "China Daylight Time" -msgstr "" +msgstr "Kiinan kesäaika" #: tzres.rc:160 msgid "North Asia Standard Time" -msgstr "" +msgstr "Pohjois-Aasian normaaliaika" #: tzres.rc:161 msgid "North Asia Daylight Time" -msgstr "" +msgstr "Pohjois-Aasian kesäaika" #: tzres.rc:104 msgid "Georgian Standard Time" -msgstr "" +msgstr "Georgian normaaliaika" #: tzres.rc:105 msgid "Georgian Daylight Time" -msgstr "" +msgstr "Georgian kesäaika" #: tzres.rc:152 msgid "Nepal Standard Time" -msgstr "" +msgstr "Nepalin normaaliaika" #: tzres.rc:153 msgid "Nepal Daylight Time" -msgstr "" +msgstr "Nepalin kesäaika" #: tzres.rc:60 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "Kap Verden normaaliaika" #: tzres.rc:61 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "Kap Verden kesäaika" #: tzres.rc:74 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "Keskieurooppalainen" +msgstr "Keski-Euroopan normaaliaika" #: tzres.rc:75 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "Keskieurooppalainen" +msgstr "Keski-Euroopan kesäaika" #: tzres.rc:140 msgid "Morocco Standard Time" -msgstr "" +msgstr "Marokon normaaliaika" #: tzres.rc:141 msgid "Morocco Daylight Time" -msgstr "" +msgstr "Marokon kesäaika" #: tzres.rc:72 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "Keskieurooppalainen" +msgstr "Keski-Euroopan normaaliaika" #: tzres.rc:73 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "Keskieurooppalainen" +msgstr "Keski-Euroopan kesäaika" #: tzres.rc:118 msgid "Iran Standard Time" -msgstr "" +msgstr "Iranin normaaliaika" #: tzres.rc:119 msgid "Iran Daylight Time" -msgstr "" +msgstr "Iranin kesäaika" #: tzres.rc:150 msgid "Namibia Standard Time" -msgstr "" +msgstr "Namibian normaaliaika" #: tzres.rc:151 msgid "Namibia Daylight Time" -msgstr "" +msgstr "Namibian kesäaika" #: tzres.rc:200 msgid "Tonga Standard Time" -msgstr "" +msgstr "Tongan normaaliaika" #: tzres.rc:201 msgid "Tonga Daylight Time" -msgstr "" +msgstr "Tongan kesäaika" #: tzres.rc:144 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "Kalliovuorten normaaliaika (Meksiko)" #: tzres.rc:145 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "Kalliovuorten kesäaika (Meksiko)" #: tzres.rc:106 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "&Peruspalkki" +msgstr "GMT-normaaliaika" #: tzres.rc:107 msgid "GMT Daylight Time" -msgstr "" +msgstr "GMT-kesäaika" #: tzres.rc:68 msgid "Central Asia Standard Time" -msgstr "" +msgstr "Keski-Aasian normaaliaika" #: tzres.rc:69 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "Keski-Aasian kesäaika" #: tzres.rc:38 msgid "Arabic Standard Time" -msgstr "" +msgstr "Arabian normaaliaika" #: tzres.rc:39 msgid "Arabic Daylight Time" -msgstr "" +msgstr "Arabian kesäaika" #: tzres.rc:132 msgid "Magadan Standard Time" -msgstr "" +msgstr "Magadanin normaaliaika" #: tzres.rc:133 msgid "Magadan Daylight Time" -msgstr "" +msgstr "Magadanin kesäaika" #: tzres.rc:156 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "Newfoundlandin normaaliaika" #: tzres.rc:157 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "Newfoundlandin kesäaika" #: tzres.rc:224 msgid "West Pacific Standard Time" -msgstr "" +msgstr "Länsi-Tyynenmeren normaaliaika" #: tzres.rc:225 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "Länsi-Tyynenmeren kesäaika" #: tzres.rc:164 msgid "Pacific Standard Time" -msgstr "" +msgstr "Tyynenmeren normaaliaika" #: tzres.rc:165 msgid "Pacific Daylight Time" -msgstr "" +msgstr "Tyynenmeren kesäaika" #: tzres.rc:48 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "Azerbaidžanin normaaliaika" #: tzres.rc:49 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "Azerbaidžanin kesäaika" #: tzres.rc:182 msgid "Samoa Standard Time" -msgstr "" +msgstr "Samoan normaaliaika" #: tzres.rc:183 msgid "Samoa Daylight Time" -msgstr "" +msgstr "Samoan kesäaika" #: tzres.rc:124 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "Kaliningradin normaaliaika" #: tzres.rc:125 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "Kaliningradin kesäaika" #: tzres.rc:166 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "Tyynenmeren normaaliaika (Meksiko)" #: tzres.rc:167 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "Tyynenmeren kesäaika (Meksiko)" #: tzres.rc:136 msgid "Middle East Standard Time" -msgstr "" +msgstr "Lähi-idän normaaliaika" #: tzres.rc:137 msgid "Middle East Daylight Time" -msgstr "" +msgstr "Lähi-idän kesäaika" #: tzres.rc:198 msgid "Tokyo Standard Time" -msgstr "" +msgstr "Tokion normaaliaika" #: tzres.rc:199 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "Tokion kesäaika" #: tzres.rc:130 msgid "Line Islands Standard Time" -msgstr "" +msgstr "Linesaarten normaaliaika" #: tzres.rc:131 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "Linesaarten kesäaika" #: tzres.rc:122 msgid "Jordan Standard Time" -msgstr "" +msgstr "Jordanian normaaliaika" #: tzres.rc:123 msgid "Jordan Daylight Time" -msgstr "" +msgstr "Jordanian kesäaika" #: tzres.rc:78 msgid "Central Standard Time" -msgstr "" +msgstr "Keskinen normaaliaika" #: tzres.rc:79 msgid "Central Daylight Time" -msgstr "" +msgstr "Keskinen kesäaika" #: tzres.rc:50 msgid "Azores Standard Time" -msgstr "" +msgstr "Azorien normaaliaika" #: tzres.rc:51 msgid "Azores Daylight Time" -msgstr "" +msgstr "Azorien kesäaika" #: tzres.rc:158 msgid "North Asia East Standard Time" -msgstr "" +msgstr "Itäisen Pohjois-Aasian normaaliaika" #: tzres.rc:159 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "Itäisen Pohjois-Aasian kesäaika" #: tzres.rc:40 msgid "Argentina Standard Time" -msgstr "" +msgstr "Argentiinan normaaliaika" #: tzres.rc:41 msgid "Argentina Daylight Time" -msgstr "" +msgstr "Argentiinan kesäaika" #: tzres.rc:146 msgid "Myanmar Standard Time" -msgstr "" +msgstr "Myanmarin normaaliaika" #: tzres.rc:147 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "Myanmarin kesäaika" #: tzres.rc:210 tzres.rc:211 msgid "Coordinated Universal Time" -msgstr "" +msgstr "UTC-aika" #: tzres.rc:116 msgid "India Standard Time" -msgstr "" +msgstr "Intian normaaliaika" #: tzres.rc:117 msgid "India Daylight Time" -msgstr "" +msgstr "Intian kesäaika" #: tzres.rc:112 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "&Peruspalkki" +msgstr "GT-normaaliaika" #: tzres.rc:113 msgid "GTB Daylight Time" -msgstr "" +msgstr "GT-kesäaika" #: tzres.rc:202 msgid "Turkey Standard Time" -msgstr "" +msgstr "Turkin normaaliaika" #: tzres.rc:203 msgid "Turkey Daylight Time" -msgstr "" +msgstr "Turkin kesäaika" #: tzres.rc:100 msgid "Fiji Standard Time" -msgstr "" +msgstr "Fidžin normaaliaika" #: tzres.rc:101 msgid "Fiji Daylight Time" -msgstr "" +msgstr "Fidžin kesäaika" #: tzres.rc:58 msgid "Canada Central Standard Time" -msgstr "" +msgstr "Kanadan keskinen normaaliaika" #: tzres.rc:59 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "Kanadan keskinen kesäaika" #: tzres.rc:194 msgid "Taipei Standard Time" -msgstr "" +msgstr "Taipein normaaliaika" #: tzres.rc:195 msgid "Taipei Daylight Time" -msgstr "" +msgstr "Taipein kesäaika" #: tzres.rc:220 msgid "W. Europe Standard Time" -msgstr "" +msgstr "Länsi-Euroopan normaaliaika" #: tzres.rc:221 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "Länsi-Euroopan kesäaika" #: tzres.rc:138 msgid "Montevideo Standard Time" -msgstr "" +msgstr "Montevideon normaaliaika" #: tzres.rc:139 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "Montevideon kesäaika" #: tzres.rc:168 msgid "Pakistan Standard Time" -msgstr "" +msgstr "Pakistanin normaaliaika" #: tzres.rc:169 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "Pakistanin kesäaika" #: tzres.rc:62 msgid "Caucasus Standard Time" -msgstr "" +msgstr "Kaukasuksen normaaliaika" #: tzres.rc:63 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "Kaukasuksen kesäaika" #: tzres.rc:46 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "Australian itäinen normaaliaika" #: tzres.rc:47 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "Australian itäinen kesäaika" #: tzres.rc:148 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "Pohjoisen Keski-Aasian normaaliaika" #: tzres.rc:149 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "Pohjoisen Keski-Aasian kesäaika" #: tzres.rc:94 msgid "Eastern Standard Time" -msgstr "" +msgstr "Itäinen normaaliaika" #: tzres.rc:95 msgid "Eastern Daylight Time" -msgstr "" +msgstr "Itäinen kesäaika" #: tzres.rc:80 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "Keskinen normaaliaika (Meksiko)" #: tzres.rc:81 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "Keskinen kesäaika (Meksiko)" #: tzres.rc:42 msgid "Atlantic Standard Time" -msgstr "" +msgstr "Atlantin normaaliaika" #: tzres.rc:43 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "Atlantin kesäaika" #: tzres.rc:142 msgid "Mountain Standard Time" -msgstr "" +msgstr "Kalliovuorten normaaliaika" #: tzres.rc:143 msgid "Mountain Daylight Time" -msgstr "" +msgstr "Kalliovuorten kesäaika" #: tzres.rc:206 msgid "US Eastern Standard Time" -msgstr "" +msgstr "Itäinen normaaliaika (USA)" #: tzres.rc:207 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "Itäinen kesäaika (USA)" #: tzres.rc:196 msgid "Tasmania Standard Time" -msgstr "" +msgstr "Tasmanian normaaliaika" #: tzres.rc:197 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "Tasmanian kesäaika" #: tzres.rc:66 msgid "Central America Standard Time" -msgstr "" +msgstr "Keski-Amerikan normaaliaika" #: tzres.rc:67 msgid "Central America Daylight Time" -msgstr "" +msgstr "Keski-Amerikan kesäaika" #: tzres.rc:208 msgid "US Mountain Standard Time" -msgstr "" +msgstr "Kalliovuorten normaaliaika (USA)" #: tzres.rc:209 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "Kalliovuorten kesäaika (USA)" #: tzres.rc:188 msgid "South Africa Standard Time" -msgstr "" +msgstr "Etelä-Afrikan normaaliaika" #: tzres.rc:189 msgid "South Africa Daylight Time" -msgstr "" +msgstr "Etelä-Afrikan kesäaika" #: tzres.rc:64 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "Keski-Australian normaaliaika" #: tzres.rc:65 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "Keski-Australian kesäaika" #: tzres.rc:190 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "Sri Lankan normaaliaika" #: tzres.rc:191 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "Sri Lankan kesäaika" #: tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "Afganistanin normaaliaika" #: tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "Afganistanin kesäaika" #: tzres.rc:226 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "Jakutskin normaaliaika" #: tzres.rc:227 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "Jakutskin kesäaika" #: tzres.rc:176 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "Etelä-Amerikan itäinen normaaliaika" #: tzres.rc:177 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "Etelä-Amerikan itäinen kesäaika" #: tzres.rc:34 msgid "Arab Standard Time" -msgstr "" +msgstr "Saudi-Arabian normaaliaika" #: tzres.rc:35 msgid "Arab Daylight Time" -msgstr "" +msgstr "Saudi-Arabian kesäaika" #: tzres.rc:36 msgid "Arabian Standard Time" -msgstr "" +msgstr "Arabian normaaliaika" #: tzres.rc:37 msgid "Arabian Daylight Time" -msgstr "" +msgstr "Arabian kesäaika" #: tzres.rc:174 msgid "Russian Standard Time" -msgstr "" +msgstr "Venäjän normaaliaika" #: tzres.rc:175 msgid "Russian Daylight Time" -msgstr "" +msgstr "Venäjän kesäaika" #: tzres.rc:172 msgid "Romance Standard Time" -msgstr "" +msgstr "Romaaninen normaaliaika" #: tzres.rc:173 msgid "Romance Daylight Time" -msgstr "" +msgstr "Romaaninen kesäaika" #: tzres.rc:98 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "Jekaterinburgin normaaliaika" #: tzres.rc:99 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "Jekaterinburgin kesäaika" #: tzres.rc:192 msgid "Syria Standard Time" -msgstr "" +msgstr "Syyrian normaaliaika" #: tzres.rc:193 msgid "Syria Daylight Time" -msgstr "" +msgstr "Syyrian kesäaika" #: tzres.rc:44 msgid "AUS Central Standard Time" -msgstr "" +msgstr "Australian keskinen normaaliaika" #: tzres.rc:45 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "Australian keskinen kesäaika" #: tzres.rc:110 msgid "Greenwich Standard Time" -msgstr "" +msgstr "Greenwichin normaaliaika" #: tzres.rc:111 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "Greenwichin kesäaika" #: tzres.rc:204 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "Ulaanbaatarin normaaliaika" #: tzres.rc:205 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "Ulaanbaatarin kesäaika" #: tzres.rc:120 msgid "Israel Standard Time" -msgstr "" +msgstr "Israelin normaaliaika" #: tzres.rc:121 msgid "Israel Daylight Time" -msgstr "" +msgstr "Israelin kesäaika" #: tzres.rc:54 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "Bangladeshin normaaliaika" #: tzres.rc:55 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "Bangladeshin kesäaika" #: tzres.rc:178 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "Etelä-Amerikan Tyynenmeren normaaliaika" #: tzres.rc:179 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "Etelä-Amerikan Tyynenmeren kesäaika" #: tzres.rc:222 msgid "West Asia Standard Time" -msgstr "" +msgstr "Länsi-Aasian normaaliaika" #: tzres.rc:223 msgid "West Asia Daylight Time" -msgstr "" +msgstr "Länsi-Aasian kesäaika" #: tzres.rc:32 msgid "Alaskan Standard Time" -msgstr "" +msgstr "Alaskan normaaliaika" #: tzres.rc:33 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "Alaskan kesäaika" #: tzres.rc:170 msgid "Paraguay Standard Time" -msgstr "" +msgstr "Paraguayn normaaliaika" #: tzres.rc:171 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "Paraguayn kesäaika" #: tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "Päivämäärä ja aika" +msgstr "Päivämäärärajan normaaliaika" #: tzres.rc:85 msgid "Dateline Daylight Time" -msgstr "" +msgstr "Päivämäärärajan kesäaika" #: tzres.rc:128 msgid "Libya Standard Time" -msgstr "" +msgstr "Libyan normaaliaika" #: tzres.rc:129 msgid "Libya Daylight Time" -msgstr "" +msgstr "Libyan kesäaika" #: tzres.rc:52 msgid "Bahia Standard Time" -msgstr "" +msgstr "Bahian normaaliaika" #: tzres.rc:53 msgid "Bahia Daylight Time" -msgstr "" +msgstr "Bahian kesäaika" #: tzres.rc:212 msgid "Venezuela Standard Time" -msgstr "" +msgstr "Venezuelan normaaliaika" #: tzres.rc:213 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "Venezuelan kesäaika" #: tzres.rc:114 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "Havaijin normaaliaika" #: tzres.rc:115 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "Havaijin kesäaika" #: tzres.rc:184 msgid "SE Asia Standard Time" -msgstr "" +msgstr "Kaakkois-Aasian normaaliaika" #: tzres.rc:185 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "Kaakkois-Aasian kesäaika" #: tzres.rc:154 msgid "New Zealand Standard Time" -msgstr "" +msgstr "Uuden-Seelannin normaaliaika" #: tzres.rc:155 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "Uuden-Seelannin kesäaika" #: tzres.rc:70 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "Keski-Brasilian normaaliaika" #: tzres.rc:71 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "Keski-Brasilian kesäaika" #: tzres.rc:56 msgid "Belarus Standard Time" -msgstr "" +msgstr "Valko-Venäjän normaaliaika" #: tzres.rc:57 msgid "Belarus Daylight Time" -msgstr "" +msgstr "Valko-Venäjän kesäaika" #: tzres.rc:180 msgid "SA Western Standard Time" -msgstr "" +msgstr "Etelä-Amerikan läntinen normaaliaika" #: tzres.rc:181 msgid "SA Western Daylight Time" -msgstr "" +msgstr "Etelä-Amerikan läntinen kesäaika" #: tzres.rc:108 msgid "Greenland Standard Time" -msgstr "" +msgstr "Grönlannin normaaliaika" #: tzres.rc:109 msgid "Greenland Daylight Time" -msgstr "" +msgstr "Grönlannin kesäaika" #: tzres.rc:92 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "Päivämäärä ja aika" +msgstr "Pääsiäissaarten normaaliaika" #: tzres.rc:93 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "Päivämäärä ja aika" +msgstr "Pääsiäissaarten kesäaika" #: tzres.rc:96 msgid "Egypt Standard Time" -msgstr "" +msgstr "Egyptin normaaliaika" #: tzres.rc:97 msgid "Egypt Daylight Time" -msgstr "" +msgstr "Egyptin kesäaika" #: tzres.rc:134 msgid "Mauritius Standard Time" -msgstr "" +msgstr "Mauritiuksen normaaliaika" #: tzres.rc:135 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "Mauritiuksen kesäaika" #: tzres.rc:214 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "Vladivostokin normaaliaika" #: tzres.rc:215 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "Vladivostokin kesäaika" #: tzres.rc:186 msgid "Singapore Standard Time" -msgstr "" +msgstr "Singaporen normaaliaika" #: tzres.rc:187 msgid "Singapore Daylight Time" -msgstr "" +msgstr "Singaporen kesäaika" #: tzres.rc:126 msgid "Korea Standard Time" -msgstr "" +msgstr "Korean normaaliaika" #: tzres.rc:127 msgid "Korea Daylight Time" -msgstr "" +msgstr "Korean kesäaika" #: tzres.rc:86 msgid "E. Africa Standard Time" -msgstr "" +msgstr "Itä-Afrikan normaaliaika" #: tzres.rc:87 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "Itä-Afrikan kesäaika" #: tzres.rc:102 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "&Peruspalkki" +msgstr "Suomen normaaliaika" #: tzres.rc:103 msgid "FLE Daylight Time" -msgstr "" +msgstr "Suomen kesäaika" #: tzres.rc:90 msgid "E. South America Standard Time" -msgstr "" +msgstr "Itäisen Etelä-Amerikan normaaliaika" #: tzres.rc:91 msgid "E. South America Daylight Time" -msgstr "" +msgstr "Itäisen Etelä-Amerikan kesäaika" #: tzres.rc:76 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "Keski-Tyynenmeren normaaliaika" #: tzres.rc:77 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "Keski-Tyynenmeren kesäaika" #: tzres.rc:218 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "Läntisen Keski-Afrikan normaaliaika" #: tzres.rc:219 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "Läntisen Keski-Afrikan kesäaika" #: tzres.rc:162 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "Tyynenmeren Etelä-Amerikan normaaliaika" #: tzres.rc:163 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "Tyynenmeren Etelä-Amerikan kesäaika" #: tzres.rc:88 msgid "E. Australia Standard Time" -msgstr "" +msgstr "Itä-Australian normaaliaika" #: tzres.rc:89 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "Itä-Australian kesäaika" #: tzres.rc:216 msgid "W. Australia Standard Time" -msgstr "" +msgstr "Länsi-Australian normaaliaika" #: tzres.rc:217 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "Länsi-Australian kesäaika" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" -- 2.20.1

1 0

Fwd: [PATCH] systray: Hide systray for fullscreen games
by Hamish Claxton 29 Dec '18

29 Dec '18

Hi Fabian, In my testing, both SM_CXSCREEN and SM_CYSCREEN both return an int value that you can print out and check manually. I did this when initially figuring out what was going wrong. If you're unhappy, I could try comparing against the desktop windows dimensions instead. Or do you mean I should use the GetSystemMetrics() function? Either way, I thought the simplest method would be to just compare against those values. I should mention though, that before applying this patch/fix, every game I tested had the issue, and afterwards did not have the issue. Here's a video I uploaded to demonstrate the issue: https://mega.nz/embed#!YU8GRKTS!nK2JGVs6EzAhu1bs-KtH1lajx6y3XRakTFNZUYNyTwo Tested on both Wine and Wine Staging 4.0 rc4. Thanks in Advance, Hamish

2 2

[PATCH] systray: Hide systray for fullscreen games
by Hamish Claxton 29 Dec '18

29 Dec '18

This patch fixes a bug where if using the Wine virtual desktop, changing resolutions in a fullscreen game would cause the systray to be drawn over the game window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40828 Signed-off-by: Hamish Claxton <hamishclaxton(a)gmail.com> --- programs/explorer/systray.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 3d36f74e16..781da2dec5 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -780,7 +780,13 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_DISPLAYCHANGE: if (hide_systray || (!nb_displayed && !enable_shell)) do_hide_systray(); - else do_show_systray(); + else { + RECT window; + GetWindowRect( GetForegroundWindow(), &window ); + + if ( !( window.right >= SM_CXSCREEN && window.bottom >= SM_CYSCREEN ) ) + do_show_systray(); + } break; case WM_TIMER: -- 2.20.1

2 1

[PATCH 04/11] mfplat: Implement IMFAttributes::{SetItem,GetItem}.
by Jactry Zeng 29 Dec '18

29 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 142 ++++++++++++++++++++++++++++++++-- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 69 +++++++++++++++++ 3 files changed, 207 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c346512f..6e056b3609 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -35,6 +35,7 @@ #include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -448,10 +449,19 @@ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG sr return E_NOTIMPL; } +struct mfattribute +{ + struct list entry; + GUID key; + PROPVARIANT value; +}; + typedef struct _mfattributes { IMFAttributes IMFAttributes_iface; LONG ref; + CRITICAL_SECTION lock; + struct list attributes; } mfattributes; static inline mfattributes *impl_from_IMFAttributes(IMFAttributes *iface) @@ -491,6 +501,8 @@ static ULONG WINAPI mfattributes_AddRef(IMFAttributes *iface) return ref; } +static void free_attribute_object(mfattributes *object); + static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) { mfattributes *This = impl_from_IMFAttributes(iface); @@ -500,19 +512,50 @@ static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) if (!ref) { + free_attribute_object(This); HeapFree(GetProcessHeap(), 0, This); } return ref; } +static HRESULT mfattributes_getitem(mfattributes *object, REFGUID key, PROPVARIANT *value, BOOL verify_type) +{ + struct mfattribute *attribute, *attribute2; + HRESULT hres; + + EnterCriticalSection(&object->lock); + + LIST_FOR_EACH_ENTRY_SAFE(attribute, attribute2, &object->attributes, struct mfattribute, entry) + { + if(IsEqualGUID(key, &attribute->key)) + { + if(verify_type && ((value->vt && attribute->value.vt != value->vt) || + (value->vt == VT_UNKNOWN && !attribute->value.punkVal))) + hres = MF_E_INVALIDTYPE; + else + { + PropVariantCopy(value, &attribute->value); + hres = S_OK; + } + break; + } + else + hres = MF_E_ATTRIBUTENOTFOUND; + } + + LeaveCriticalSection(&object->lock); + + return hres; +} + static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PROPVARIANT *value) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + return mfattributes_getitem(This, key, value, FALSE); } static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) @@ -645,13 +688,71 @@ static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, return E_NOTIMPL; } -static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT Value) +static HRESULT mfattribute_setitem(mfattributes *object, REFGUID key, REFPROPVARIANT value) +{ + struct mfattribute *attribute, *attribute2, *new_attribute = NULL; + + EnterCriticalSection(&object->lock); + + LIST_FOR_EACH_ENTRY_SAFE(attribute, attribute2, &object->attributes, struct mfattribute, entry) + if(IsEqualGUID(key, &attribute->key)) + { + new_attribute = attribute; + PropVariantClear(&new_attribute->value); + break; + } + + if(!new_attribute) + { + new_attribute = heap_alloc(sizeof(struct mfattribute)); + if(!new_attribute) + { + LeaveCriticalSection(&object->lock); + return E_OUTOFMEMORY; + } + new_attribute->key = *key; + list_add_tail(&object->attributes, &new_attribute->entry); + } + PropVariantCopy(&new_attribute->value, value); + + LeaveCriticalSection(&object->lock); + + return S_OK; + } + +static BOOL is_type_valid(DWORD type) +{ + switch(type) + { + case MF_ATTRIBUTE_UINT32: + case MF_ATTRIBUTE_UINT64: + case MF_ATTRIBUTE_DOUBLE: + case MF_ATTRIBUTE_GUID: + case MF_ATTRIBUTE_STRING: + case MF_ATTRIBUTE_BLOB: + case MF_ATTRIBUTE_IUNKNOWN: + return TRUE; + default: + return FALSE; + } +} + +static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(key), Value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + if(!is_type_valid(value->vt)) + { + PROPVARIANT empty_value; + + PropVariantClear(&empty_value); + mfattribute_setitem(This, key, &empty_value); + return MF_E_INVALIDTYPE; + } + else + return mfattribute_setitem(This, key, value); } static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) @@ -824,6 +925,31 @@ static void init_attribute_object(mfattributes *object, UINT32 size) { object->ref = 1; object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl; + InitializeCriticalSection(&object->lock); + object->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IMFAttributes.lock"); + list_init(&object->attributes); +} + +static void free_attribute_object(mfattributes *object) +{ + EnterCriticalSection(&object->lock); + + if (!list_empty(&object->attributes)) + { + struct mfattribute *attribute, *attribute2; + + LIST_FOR_EACH_ENTRY_SAFE(attribute, attribute2, &object->attributes, struct mfattribute, entry) + { + PropVariantClear(&attribute->value); + list_remove(&attribute->entry); + heap_free(attribute); + } + } + + LeaveCriticalSection(&object->lock); + + object->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&object->lock); } /*********************************************************************** @@ -901,6 +1027,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -1368,6 +1495,7 @@ static ULONG WINAPI mfpresentationdescriptor_Release(IMFPresentationDescriptor * if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2064,6 +2192,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2426,6 +2555,7 @@ static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2940,6 +3070,7 @@ static ULONG WINAPI mfdescriptor_Release(IMFStreamDescriptor *iface) if (!ref) { + free_attribute_object(&This->attributes); heap_free(This); } @@ -3437,6 +3568,7 @@ static ULONG WINAPI mfsample_Release(IMFSample *iface) if (!ref) { + free_attribute_object(&This->attributes); heap_free(This); } diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328ad2..e80a3b7cfc 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat propsys C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..fff424e798 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -33,6 +33,7 @@ #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "propvarutil.h" #include "wine/test.h" @@ -693,6 +694,73 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static void test_IMFAttributes_item(void) +{ + IMFAttributes *attributes; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + + hr = MFCreateAttributes(&attributes, 2); + ok(hr == S_OK, "MFCreateAttributes failed: 0x%08x.\n", hr); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT32; + U(propvar).ulVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).ulVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Returned wrong property: (vt: %x, ulVal: %d).\n", + ret_propvar.vt, U(ret_propvar).ulVal); + PropVariantClear(&ret_propvar); + + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_STRING; + U(ret_propvar).pwszVal = NULL; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Returned wrong property: (vt: %x, ulVal: %d).\n", + ret_propvar.vt, U(ret_propvar).ulVal); + PropVariantClear(&ret_propvar); + + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT64; + U(propvar).uhVal.QuadPart = 65536; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).ulVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Returned wrong property: (vt: %x, ulVal: %d).\n", + ret_propvar.vt, U(ret_propvar).ulVal); + PropVariantClear(&ret_propvar); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID2, &propvar); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_SetItem should failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).lVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID2, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + PropVariantClear(&propvar); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Returned wrong property: (vt: %x, ulVal: %d).\n", + ret_propvar.vt, U(ret_propvar).ulVal); + PropVariantClear(&ret_propvar); + + IMFAttributes_Release(attributes); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -708,6 +776,7 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_IMFAttributes_item(); CoUninitialize(); } -- 2.19.2

3 4

[PATCH] ml.po:Support Malayalam Translation
by Denil Verghese 29 Dec '18

29 Dec '18

Signed-off-by: Denil Verghese <denilverghese(a)gmail.com> --- po/ml.po | 122 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 63 insertions(+), 59 deletions(-) diff --git a/po/ml.po b/po/ml.po index 005162ca9d..04050a0996 100644 --- a/po/ml.po +++ b/po/ml.po @@ -6,7 +6,7 @@ msgstr "" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" "PO-Revision-Date: N/A\n" -"Last-Translator: Automatically generated\n" +"Last-Translator: Denil C Verghese\n" "Language-Team: Malayalam\n" "Language: ml\n" "MIME-Version: 1.0\n" @@ -15,42 +15,46 @@ msgstr "" #: appwiz.rc:58 msgid "Install/Uninstall" -msgstr "" +msgstr "ഇൻസ്റ്റാൾ/അൺഇൻസ്റ്റാൾ" #: appwiz.rc:61 msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "" +msgstr "ഫ്ലോപ്പി ഡിസ്ക്, സിഡി-റോം ഡ്രൈവ്, അല്ലെങ്കിൽ നിങ്ങളുടെ " +"ഹാർഡ് ഡ്രൈവ് എന്നിവയിൽ നിന്നും ഒരു പുതിയ പ്രോഗ്രാം ഇൻസ്റ്റാൾ " +"ചെയ്യാൻ ഇൻസ്റ്റാൾ ചെയ്യുക ക്ലിക്കുചെയ്യുക." #: appwiz.rc:62 msgid "&Install..." -msgstr "" +msgstr "ഇൻസ്റ്റാൾ (&I)" #: appwiz.rc:65 msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" "Remove." -msgstr "" +msgstr "ഇനിപ്പറയുന്ന സോഫ്റ്റ്വെയർ സ്വപ്രേരിതമായി നീക്കംചെയ്യാം. " +"ഒരു പ്രോഗ്രാം നീക്കംചെയ്യാനോ അതിന്റെ ഇൻസ്റ്റാൾ ചെയ്ത ഭാഗങ്ങൾ " +"പരിഷ്ക്കരിക്കുന്നതിന് ലിസ്റ്റിൽ നിന്ന് അത് തിരഞ്ഞെടുത്ത് " +"പരിഷ്ക്കരിക്കുക/നീക്കം ചെയ്യുക ക്ലിക്കുചെയ്യുക." #: appwiz.rc:67 -#, fuzzy msgid "&Support Information" -msgstr "_അക്ഷരസഞ്ചയം..." +msgstr "പിന്തുണ വിവരം (&S)" #: appwiz.rc:68 regedit.rc:133 regedit.rc:232 msgid "&Modify..." -msgstr "" +msgstr "പരിഷ്ക്കരിക്കുക... (&M)" #: appwiz.rc:69 appwiz.rc:45 cryptui.rc:351 msacm32.rc:40 winecfg.rc:200 #: winecfg.rc:237 wordpad.rc:256 msgid "&Remove" -msgstr "" +msgstr "നീക്കംചെയ്യുക (&R)" #: appwiz.rc:75 msgid "Support Information" -msgstr "" +msgstr "പിന്തുണ വിവരം" #: appwiz.rc:78 avifil32.rc:54 comctl32.rc:71 comctl32.rc:55 comdlg32.rc:232 #: comdlg32.rc:262 comdlg32.rc:305 comdlg32.rc:359 comdlg32.rc:398 @@ -68,44 +72,44 @@ msgstr "" #: winemine.rc:73 winemine.rc:84 winemine.rc:98 wordpad.rc:215 wordpad.rc:226 #: wordpad.rc:244 wordpad.rc:257 msgid "OK" -msgstr "" +msgstr "ശരി" #: appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "" +msgstr "%s നുള്ള സാങ്കേതിക പിന്തുണ ലഭിക്കാൻ താഴെ പറയുന്ന " +"വിവരങ്ങൾ ഉപയോഗിക്കാം:" #: appwiz.rc:80 msgid "Publisher:" -msgstr "" +msgstr "പ്രസാധകൻ:" #: appwiz.rc:81 winefile.rc:166 msgid "Version:" -msgstr "" +msgstr "പതിപ്പ്:" #: appwiz.rc:82 msgid "Contact:" -msgstr "" +msgstr "ബന്ധപ്പെടുക:" #: appwiz.rc:83 -#, fuzzy msgid "Support Information:" -msgstr "_അക്ഷരസഞ്ചയം..." +msgstr "പിന്തുണ വിവരം:" #: appwiz.rc:84 msgid "Support Telephone:" -msgstr "" +msgstr "ടെലിഫോൺ പിന്തുണ:" #: appwiz.rc:85 msgid "Readme:" -msgstr "" +msgstr "എന്നെ വായിക്കൂ:" #: appwiz.rc:86 msgid "Product Updates:" -msgstr "" +msgstr "ഉൽപ്പന്ന അപ്ഡേറ്റുകൾ:" #: appwiz.rc:87 msgid "Comments:" -msgstr "" +msgstr "അഭിപ്രായങ്ങൾ:" #: appwiz.rc:100 msgid "Wine Gecko Installer" @@ -124,7 +128,7 @@ msgstr "" #: appwiz.rc:109 appwiz.rc:124 msgid "&Install" -msgstr "" +msgstr "ഇൻസ്റ്റാൾ (&I)" #: appwiz.rc:110 appwiz.rc:125 avifil32.rc:55 browseui.rc:45 comctl32.rc:72 #: comctl32.rc:87 comctl32.rc:56 comdlg32.rc:171 comdlg32.rc:193 @@ -164,17 +168,20 @@ msgstr "" #: appwiz.rc:31 msgid "Add/Remove Programs" -msgstr "" +msgstr "പ്രോഗ്രാമുകൾ ചേർക്കുക/നീക്കംചെയ്യുക" #: appwiz.rc:32 msgid "" "Allows you to install new software, or remove existing software from your " "computer." msgstr "" +"പുതിയ സോഫ്റ്റ്വെയർ ഇൻസ്റ്റാൾ ചെയ്യാൻ അല്ലെങ്കിൽ, നിങ്ങളുടെ " +"കമ്പ്യൂട്ടറിൽ നിന്നും നിലവിലുള്ള സോഫ്റ്റ്വെയർ നീക്കംചെയ്യാൻ " +"നിങ്ങളെ അനുവദിക്കുന്നു." #: appwiz.rc:33 taskmgr.rc:262 winecfg.rc:33 msgid "Applications" -msgstr "" +msgstr "അപ്ലിക്കേഷനുകൾ" #: appwiz.rc:35 msgid "" @@ -184,44 +191,44 @@ msgstr "" #: appwiz.rc:36 msgid "Not specified" -msgstr "" +msgstr "വ്യക്തമാക്കിയിട്ടില്ല" #: appwiz.rc:38 shell32.rc:144 shell32.rc:241 regedit.rc:147 winefile.rc:107 msgid "Name" -msgstr "" +msgstr "പേര്" #: appwiz.rc:39 msgid "Publisher" -msgstr "" +msgstr "പ്രസാധകൻ" #: appwiz.rc:40 cryptui.rc:54 msgid "Version" -msgstr "" +msgstr "പതിപ്പ്" #: appwiz.rc:41 msgid "Installation programs" -msgstr "" +msgstr "ഇൻസ്റ്റലേഷൻ പ്രോഗ്രാമുകൾ" #: appwiz.rc:42 msgid "Programs (*.exe)" -msgstr "" +msgstr "പ്രോഗ്രാമുകൾ (*.exe)" #: appwiz.rc:43 avifil32.rc:33 cryptui.rc:83 shell32.rc:199 notepad.rc:76 #: oleview.rc:103 progman.rc:82 regedit.rc:225 winedbg.rc:43 winhlp32.rc:90 msgid "All files (*.*)" -msgstr "" +msgstr "എല്ലാ ഫയലുകളും (*.*)" #: appwiz.rc:46 msgid "&Modify/Remove" -msgstr "" +msgstr "പരിഷ്ക്കരിക്കുക/നീക്കംചെയ്യുക (&M)" #: appwiz.rc:51 msgid "Downloading..." -msgstr "" +msgstr "ഡൗൺലോഡുചെയ്യുന്നു..." #: appwiz.rc:52 msgid "Installing..." -msgstr "" +msgstr "ഇൻസ്റ്റാൾ ചെയ്യുന്നു..." #: appwiz.rc:53 msgid "" @@ -239,7 +246,7 @@ msgstr "" #: avifil32.rc:48 wordpad.rc:76 msgid "&Options..." -msgstr "" +msgstr "ഓപ്ഷനുകൾ... (&O)" #: avifil32.rc:49 msgid "&Interleave every" @@ -247,32 +254,31 @@ msgstr "" #: avifil32.rc:51 msvfw32.rc:51 msgid "frames" -msgstr "" +msgstr "ഫ്രെയിമുകൾ" #: avifil32.rc:52 -#, fuzzy msgid "Current format:" -msgstr "_അക്ഷരസഞ്ചയം..." +msgstr "നിലവിലെ ഫോർമാറ്റ്:" #: avifil32.rc:30 msgid "Waveform: %s" -msgstr "" +msgstr "തരംഗരൂപം: %s" #: avifil32.rc:31 msgid "Waveform" -msgstr "" +msgstr "തരംഗരൂപം" #: avifil32.rc:32 msgid "All multimedia files" -msgstr "" +msgstr "എല്ലാ മൾട്ടിമീഡിയ ഫയലുകളും" #: avifil32.rc:34 msgid "video" -msgstr "" +msgstr "വീഡിയോ" #: avifil32.rc:35 msgid "audio" -msgstr "" +msgstr "ഓഡിയോ" #: avifil32.rc:36 msgid "Wine AVI-default-filehandler" @@ -284,29 +290,27 @@ msgstr "" #: browseui.rc:28 msgid "Canceling..." -msgstr "" +msgstr "റദ്ദാക്കുന്നു..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 ശേഷിക്കുന്നു" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 and %3!u! %4 ശേഷിക്കുന്നു" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "_സെക്കന്‍ഡുകള്‍" +msgstr "സെക്കന്‍ഡുകള്‍" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "മിനിറ്റുകൾ" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "മണിക്കൂറുകൾ" #: comctl32.rc:68 winefile.rc:157 #, fuzzy @@ -315,11 +319,11 @@ msgstr "വി_വരം" #: comctl32.rc:73 comdlg32.rc:264 msgid "&Apply" -msgstr "" +msgstr "പ്രയോഗിക്കുക (&A)" #: comctl32.rc:74 comctl32.rc:88 comdlg32.rc:307 user32.rc:88 msgid "Help" -msgstr "" +msgstr "സഹായം" #: comctl32.rc:81 msgid "Wizard" @@ -327,7 +331,7 @@ msgstr "" #: comctl32.rc:84 msgid "< &Back" -msgstr "" +msgstr "< തിരികെ (&B)" #: comctl32.rc:85 msgid "&Next >" @@ -335,11 +339,11 @@ msgstr "" #: comctl32.rc:86 msgid "Finish" -msgstr "" +msgstr "പൂർത്തിയാക്കുക" #: comctl32.rc:97 msgid "Customize Toolbar" -msgstr "" +msgstr "ഉപകരണബാർ ഇഷ്ടാനുസൃതമാക്കുക" #: comctl32.rc:100 comctl32.rc:57 cryptui.rc:356 ieframe.rc:43 oleview.rc:83 #: oleview.rc:187 oleview.rc:200 oleview.rc:212 taskmgr.rc:139 @@ -407,16 +411,16 @@ msgstr "" #: comctl32.rc:62 msgid "Hide details" -msgstr "" +msgstr "വിശദാംശങ്ങൾ മറയ്ക്കുക" #: comctl32.rc:63 msgid "See details" -msgstr "" +msgstr "വിശദാംശങ്ങൾ കാണുക" #: comctl32.rc:31 cryptui.rc:235 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 msgid "Close" -msgstr "" +msgstr "അടയ്ക്കുക" #: comctl32.rc:36 msgid "Today:" -- 2.16.2.windows.1

1 0

[PATCH] wininet: Return proper cache path from GetUrlCacheConfigInfo.
by Dmitry Timoshkov 29 Dec '18

29 Dec '18

This patch makes an application with built-in internet shop work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/tests/urlcache.c | 53 ++++++++++++++++ dlls/wininet/urlcache.c | 113 +++++++++++++++++++++++++++++++--- 2 files changed, 158 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 3799500489..4794cb0b6e 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -1100,6 +1103,55 @@ static void test_trailing_slash(void) DeleteFileA(filename); } +static void test_GetUrlCacheConfigInfo(void) +{ + INTERNET_CACHE_CONFIG_INFOA info; + struct + { + INTERNET_CACHE_CONFIG_INFOA *info; + DWORD dwStructSize; + DWORD flags; + BOOL ret; + DWORD error; + } td[] = + { +#if 0 /* crashes under Vista */ + { NULL, 0, 0, FALSE, ERROR_INVALID_PARAMETER }, +#endif + { &info, 0, 0, TRUE }, + { &info, sizeof(info) - 1, 0, TRUE }, + { &info, sizeof(info) + 1, 0, TRUE }, + { &info, 0, CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + }; + int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(td); i++) + { + if (td[i].info) + { + memset(&info, 0, sizeof(*td[i].info)); + info.dwStructSize = td[i].dwStructSize; + } + + SetLastError(0xdeadbeef); + ret = GetUrlCacheConfigInfoA(td[i].info, NULL, td[i].flags); + ok(ret == td[i].ret, "%d: expected %d, got %d\n", i, td[i].ret, ret); + if (!ret) + ok(GetLastError() == td[i].error, "%d: expected %u, got %u\n", i, td[i].error, GetLastError()); + else + { + ok(info.dwStructSize == td[i].dwStructSize, "got %u\n", info.dwStructSize); + ok(info.u.s.CachePath[0], "%d: got empty path\n", i); + } + } +} + START_TEST(urlcache) { HMODULE hdll; @@ -1124,4 +1176,5 @@ START_TEST(urlcache) test_FindCloseUrlCache(); test_GetDiskInfoA(); test_trailing_slash(); + test_GetUrlCacheConfigInfo(); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f26fa3468d..c8d141e3d9 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -23,6 +23,7 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ws2tcpip.h" @@ -3764,21 +3765,117 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, /*********************************************************************** * GetUrlCacheConfigInfoW (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + cache_container *container; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = 0x3e800; + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + + info->u.s.CachePath[0] = 0; + info->u.s.dwCacheSize = 0x3e800; /* FIXME */ + + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) + { + switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + if (container->default_entry_type == NORMAL_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + if (container->default_entry_type == COOKIE_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + default: + FIXME("flags %08x not handled\n", flags); + break; + } + } + + TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath)); + + return TRUE; } /*********************************************************************** * GetUrlCacheConfigInfoA (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + cache_container *container; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = 0x3e800; + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + + info->u.s.CachePath[0] = 0; + info->u.s.dwCacheSize = 0x3e800; /* FIXME */ + + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) + { + switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + if (container->default_entry_type == NORMAL_CACHE_ENTRY) + WideCharToMultiByte(CP_ACP, 0, container->path, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + if (container->default_entry_type == COOKIE_CACHE_ENTRY) + WideCharToMultiByte(CP_ACP, 0, container->path, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) + WideCharToMultiByte(CP_ACP, 0, container->path, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + break; + + default: + FIXME("flags %08x not handled\n", flags); + break; + } + } + + TRACE("CachePath %s\n", debugstr_a(info->u.s.CachePath)); + + return TRUE; } BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, -- 2.19.2

1 0

[PATCH] kernel32: CreateDirectory shouldn't return ERROR_ACCESS_DENIED for the root of the drive.
by Dmitry Timoshkov 28 Dec '18

28 Dec '18

According to the testbot results CreateDirectory("C:\\", NULL) fails with ERROR_ACCESS_DENIED for not administrators. However with UAC enabled and not and administrator account I get ERROR_ALREADY_EXISTS in that case with Windows 7 64-bit running on real hardware. Moreover, Wine doesn't really perform any access checks in that case and blindly assumes that returning STATUS_ACCESS_DENIED is correct behaviour for the drive's root: dlls/ntdll/directory.c,lookup_unix_name(). This patch fixes an application that can't find its data files because after it receives ERROR_ACCESS_DENIED it stops further directory traversing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/directory.c | 43 +++++++++++++++++++++++++++++++++ dlls/ntdll/directory.c | 3 +-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 512dc6d22a..de78c61681 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -541,10 +541,53 @@ static void test_SetCurrentDirectoryA(void) ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %d\n", GetLastError() ); } +static void test_CreateDirectory_root(void) +{ + static const WCHAR drive_c_root[] = { 'C',':','\\',0 }; + static const WCHAR drive_c[] = { 'C',':',0 }; + char curdir[MAX_PATH]; + BOOL ret; + + GetCurrentDirectoryA(sizeof(curdir), curdir); + + ret = SetCurrentDirectoryA("C:\\"); + ok(ret, "SetCurrentDirectory error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:\\", NULL); + ok(!ret, "CreateDirectory should fail\n"); + if (GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("not an administrator\n"); + SetCurrentDirectoryA(curdir); + return; + } + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:", NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c_root, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetCurrentDirectoryA(curdir); +} + START_TEST(directory) { init(); + test_CreateDirectory_root(); + test_GetWindowsDirectoryA(); test_GetWindowsDirectoryW(); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c48b9e97ea..2719958f67 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2650,9 +2650,8 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer { if (!stat( unix_name, &st )) { - /* creation fails with STATUS_ACCESS_DENIED for the root of the drive */ if (disposition == FILE_CREATE) - return name_len ? STATUS_OBJECT_NAME_COLLISION : STATUS_ACCESS_DENIED; + return STATUS_OBJECT_NAME_COLLISION; return STATUS_SUCCESS; } } -- 2.19.2

3 13

[PATCH v2] user32/tests: Add some tests for implicit stretch mode in CopyImage().
by Paul Gofman 28 Dec '18

28 Dec '18

The test is related to bug https://bugs.winehq.org/show_bug.cgi?id=46375. The values of the colored test result suggest that halftone filter is used for shrinking: each pixel of output 2x2 image has the color value averaged over 4 pixels from input 4x4 image. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2: Fixed some typos. dlls/user32/tests/cursoricon.c | 125 +++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 323db82bc3..c598b232a0 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2751,6 +2751,130 @@ static void test_monochrome_icon(void) HeapFree(GetProcessHeap(), 0, icon_data); } +static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO *bmi, + unsigned int row, unsigned int column) +{ + const BITMAPINFOHEADER *h = &bmi->bmiHeader; + const unsigned char *data; + unsigned int stride; + RGBQUAD color; + + ok(h->biBitCount == 1 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); + stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; + data = bits + row * stride + column * h->biBitCount / 8; + if (h->biBitCount >= 24) + return RGB(data[2], data[1], data[0]); + + color = bmi->bmiColors[!!(data[0] & (1u << (7 - (column % 8))))]; + return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); +} + +static void test_CopyImage_StretchMode(void) +{ + static const unsigned char test_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, + 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, + }; + static const unsigned char expected_bits_24[] = + { + 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, + 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, + }; + static const unsigned char test_bits_1[] = + { + 0x30, 0x0, 0x0, 0x0, + 0x30, 0x0, 0x0, 0x0, + 0x40, 0x0, 0x0, 0x0, + 0xc0, 0x0, 0x0, 0x0, + }; + static const unsigned char expected_bits_1[] = + { + 0x40, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + }; + + static const struct + { + LONG width, height, output_width, output_height; + WORD bit_count; + const unsigned char *test_bits, *expected_bits; + size_t test_bits_size, result_bits_size; + BOOL todo; + } + tests[] = + { + {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, + sizeof(test_bits_24), sizeof(expected_bits_24), TRUE}, + {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, + sizeof(test_bits_1), sizeof(expected_bits_1), FALSE}, + }; + + HBITMAP bitmap, bitmap_copy; + unsigned char *result_bits; + unsigned int row, column; + unsigned int test_index; + unsigned char *bits; + BITMAPINFO *bmi; + HDC hdc; + int ret; + + bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiColors[1].rgbRed = 0xff; + bmi->bmiColors[1].rgbGreen = 0xff; + bmi->bmiColors[1].rgbBlue = 0xff; + + hdc = GetDC(NULL); + + for (test_index = 0; test_index < ARRAY_SIZE(tests); ++test_index) + { + bmi->bmiHeader.biWidth = tests[test_index].width; + bmi->bmiHeader.biHeight = tests[test_index].height; + bmi->bmiHeader.biBitCount = tests[test_index].bit_count; + + bitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, (void **)&bits, NULL, 0); + ok(bitmap && bits, "CreateDIBSection() failed, result %u.\n", GetLastError()); + memcpy(bits, tests[test_index].test_bits, tests[test_index].test_bits_size); + + bitmap_copy = CopyImage(bitmap, IMAGE_BITMAP, tests[test_index].output_width, + tests[test_index].output_height, LR_CREATEDIBSECTION); + ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); + + result_bits = HeapAlloc(GetProcessHeap(), 0, tests[test_index].result_bits_size); + + bmi->bmiHeader.biWidth = tests[test_index].output_width; + bmi->bmiHeader.biHeight = tests[test_index].output_height; + ret = GetDIBits(hdc, bitmap_copy, 0, tests[test_index].output_height, + result_bits, bmi, DIB_RGB_COLORS); + ok(ret == tests[test_index].output_height, "Unexpected GetDIBits result %d, GetLastError() %u.\n", + ret, GetLastError()); + + for (row = 0; row < tests[test_index].output_height; ++row) + for (column = 0; column < tests[test_index].output_width; ++column) + { + COLORREF result, expected; + + result = get_color_from_bits(result_bits, bmi, row, column); + expected = get_color_from_bits(tests[test_index].expected_bits, bmi, row, column); + + todo_wine_if(tests[test_index].todo) + ok(result == expected, "Colors do not match, " + "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + result, expected, test_index, row, column); + } + DeleteObject(bitmap); + DeleteObject(bitmap_copy); + HeapFree(GetProcessHeap(), 0, result_bits); + } + ReleaseDC(0, hdc); + HeapFree(GetProcessHeap(), 0, bmi); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -2778,6 +2902,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); + test_CopyImage_StretchMode(); test_initial_cursor(); test_CreateIcon(); test_LoadImage(); -- 2.19.2

1 0

[PATCH] user32/tests: Add some tests for implicit stretch mode in CopyImage().
by Paul Gofman 28 Dec '18

28 Dec '18

The test is related to bug https://bugs.winehq.org/show_bug.cgi?id=46375. The values of the colored test result suggest that halftone filter is used for shrinking: each pixel of output 2x2 image has the color value averaged over 4 pixels from input 4x4 image. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/cursoricon.c | 125 +++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 323db82bc3..2f830cac6e 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2751,6 +2751,130 @@ static void test_monochrome_icon(void) HeapFree(GetProcessHeap(), 0, icon_data); } +static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO *bmi, + unsigned int row, unsigned int column) +{ + const BITMAPINFOHEADER *h = &bmi->bmiHeader; + const unsigned char *data; + unsigned int stride; + RGBQUAD color; + + ok(h->biBitCount == 1 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); + stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; + data = bits + row * stride + column * h->biBitCount / 8; + if (h->biBitCount >= 24) + return RGB(data[2], data[1], data[0]); + + color = bmi->bmiColors[!!(data[0] & (1u << (7 - (column % 8))))]; + return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); +} + +static void test_CopyImage_StretchMode(void) +{ + static const unsigned char test_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, + 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, + }; + static const unsigned char expected_bits_24[] = + { + 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, + 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, + }; + static const unsigned char test_bits_1[] = + { + 0x30, 0x0, 0x0, 0x0, + 0x30, 0x0, 0x0, 0x0, + 0x40, 0x0, 0x0, 0x0, + 0xc0, 0x0, 0x0, 0x0, + }; + static const unsigned char expected_bits_1[] = + { + 0x40, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + }; + + static const struct + { + LONG width, height, output_width, output_height; + WORD bit_count; + const unsigned char *test_bits, *expected_bits; + size_t test_bits_size, result_bits_size; + BOOL todo; + } + tests[] = + { + {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, + sizeof(test_bits_24), sizeof(expected_bits_24), TRUE}, + {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, + sizeof(test_bits_1), sizeof(expected_bits_1), FALSE}, + }; + + HBITMAP bitmap, bitmap_copy; + unsigned char *result_bits; + unsigned int row, column; + unsigned int test_index; + unsigned char *bits; + BITMAPINFO *bmi; + HDC hdc; + int ret; + + bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiColors[1].rgbRed = 0xff; + bmi->bmiColors[1].rgbGreen = 0xff; + bmi->bmiColors[1].rgbBlue = 0xff; + + hdc = GetDC(NULL); + + for (test_index = 0; test_index < ARRAY_SIZE(tests); ++test_index) + { + bmi->bmiHeader.biWidth = tests[test_index].width; + bmi->bmiHeader.biHeight = tests[test_index].width; + bmi->bmiHeader.biBitCount = tests[test_index].bit_count; + + bitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, (void **)&bits, NULL, 0); + ok(bitmap && bits, "CreateDIBSection() failed, result %u.\n", GetLastError()); + memcpy(bits, tests[test_index].test_bits, tests[test_index].test_bits_size); + + bitmap_copy = CopyImage(bitmap, IMAGE_BITMAP, tests[test_index].output_width, + tests[test_index].output_height, LR_CREATEDIBSECTION); + ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); + + result_bits = HeapAlloc(GetProcessHeap(), 0, tests[test_index].result_bits_size); + + bmi->bmiHeader.biWidth = tests[test_index].output_width; + bmi->bmiHeader.biHeight = tests[test_index].output_height; + ret = GetDIBits(hdc, bitmap_copy, 0, tests[test_index].output_height, + result_bits, bmi, DIB_RGB_COLORS); + ok(ret == tests[test_index].output_height, "Unexpected GetDIBits result %d, GetLastError() %u.\n", + ret, GetLastError()); + + for (row = 0; row < tests[test_index].output_width; ++row) + for (column = 0; column < tests[test_index].output_height; ++column) + { + COLORREF result, expected; + + result = get_color_from_bits(result_bits, bmi, row, column); + expected = get_color_from_bits(tests[test_index].expected_bits, bmi, row, column); + + todo_wine_if(tests[test_index].todo) + ok(result == expected, "Colors do not match, " + "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + result, expected, test_index, row, column); + } + DeleteObject(bitmap); + DeleteObject(bitmap_copy); + HeapFree(GetProcessHeap(), 0, result_bits); + } + ReleaseDC(0, hdc); + HeapFree(GetProcessHeap(), 0, bmi); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -2778,6 +2902,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); + test_CopyImage_StretchMode(); test_initial_cursor(); test_CreateIcon(); test_LoadImage(); -- 2.19.2

1 0

[PATCH 05/11] mfplat: Implement IMFattributes::{SetUInt32,SetUInt64,GetUInt32,GetUInt64}.
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 39 ++++++++++++++++++++++++++++++-------- dlls/mfplat/tests/mfplat.c | 28 +++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 76843f5f25..9a4e41c430 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 propsys C_SRCS = \ main.c diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6e056b3609..1d8b110a09 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "propvarutil.h" #include "wine/heap.h" #include "wine/debug.h" @@ -589,19 +590,33 @@ static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes * static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_UINT32; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToUInt32(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_UINT64; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToUInt64(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) @@ -776,19 +791,27 @@ static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) static HRESULT WINAPI mfattributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %d)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI4; + attrval.ulVal = value; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); + FIXME("(%p, %s, %s)\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_UINT64; + attrval.uhVal.QuadPart = value; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fff424e798..7ae87c2fc1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -413,6 +413,8 @@ static void test_MFCreateAttributes(void) IMFAttributes *attributes; HRESULT hr; UINT32 count; + UINT32 uint32_value; + UINT64 uint64_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -422,13 +424,35 @@ static void test_MFCreateAttributes(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 0, "got %d\n", count); - hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); + ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: 0x%08x.\n", hr); hr = IMFAttributes_GetCount(attributes, &count); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(count == 1, "got %d\n", count); + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == S_OK, "IMFAttributes_GetUINT32 failed: 0x%08x.\n", hr); + ok(uint32_value == 123, "got wrong value: %d, expected: 123.\n", uint32_value); + + uint64_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT64 should fail: 0x%08x.\n", hr); + ok(uint64_value == 0xdeadbeef, "got wrong value: %lld, expected: 0xdeadbeef.\n", uint64_value); + + hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); + ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); + ok(uint64_value == 65536, "got wrong value: %lld, expected: 65536.\n", uint64_value); + + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT32 should fail: 0x%08x.\n", hr); + ok(uint32_value == 0xdeadbeef, "got wrong value: %d, expected: 0xdeadbeef.\n", uint32_value); + IMFAttributes_Release(attributes); } -- 2.19.2

2 1

[PATCH 11/11] mfplat: Implement IMFattributes::{SetUnknown,GetUnknown}.
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 20 ++++++++--- dlls/mfplat/tests/mfplat.c | 74 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7a6d8d5475..c1f0188a0f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -731,10 +731,18 @@ static HRESULT WINAPI mfattributes_GetAllocatedBlob(IMFAttributes *iface, REFGUI static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, REFIID riid, void **ppv) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %s, %p\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); + TRACE("(%p, %s, %s, %p)\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_IUNKNOWN; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = IUnknown_QueryInterface(attrval.punkVal, riid, ppv); + PropVariantClear(&attrval); + return hres; } static HRESULT mfattribute_setitem(mfattributes *object, REFGUID key, REFPROPVARIANT value) @@ -901,10 +909,14 @@ static HRESULT WINAPI mfattributes_SetBlob(IMFAttributes *iface, REFGUID key, co static HRESULT WINAPI mfattributes_SetUnknown(IMFAttributes *iface, REFGUID key, IUnknown *unknown) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), unknown); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), unknown); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UNKNOWN; + attrval.punkVal = unknown; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_LockStore(IMFAttributes *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 975b40a5f3..c7f8fe6e51 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -53,6 +53,7 @@ DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x8 DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; @@ -419,6 +420,50 @@ static void _check_count(IMFAttributes* obj, ULONG expected, int line) ok_(__FILE__,line)(count == expected, "got %d, expected %d.\n", count, expected); } +struct unk_impl +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_QueryInterface()\n"); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_AddRef()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_Release()\n"); + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; @@ -429,6 +474,9 @@ static void test_MFCreateAttributes(void) const static WCHAR stringW[] = {'W','i','n','e',0}; WCHAR bufferW[256] = {0}; WCHAR *allacted_string = NULL; + IUnknown *unk_value = NULL, *unk = NULL; + struct unk_impl unk_obj = {{&unk_vtbl}, 1}; + struct unk_impl unk_obj2 = {{&unk_vtbl}, 22}; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -507,6 +555,32 @@ static void test_MFCreateAttributes(void) ok(hr == E_INVALIDARG, "IMFAttributes_SetString should fail: 0x%08x.\n", hr); CHECK_COUNT(attributes, 3); + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID2, &unk_obj.IUnknown_iface); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: 0x%08x\n", hr); + CHECK_COUNT(attributes, 4); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IUnknown, (void **)&unk_value); + ok(hr == S_OK, "IMFAttributes_GetUnknown failed: 0x%08x\n", hr); + ok(unk_obj.ref == 3, "got wrong refcount: %d.\n", unk_obj.ref); + + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID2, &unk_obj2.IUnknown_iface); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: 0x%08x\n", hr); + CHECK_COUNT(attributes, 4); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + ok(unk_obj2.ref == 23, "got wrong refcount: %d.\n", unk_obj.ref); + unk_value = NULL; + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IUnknown, (void **)&unk_value); + ok(hr == S_OK, "IMFAttributes_GetUnknown failed: 0x%08x\n", hr); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + ok(unk_obj2.ref == 24, "got wrong refcount: %d.\n", unk_obj2.ref); + + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID3, unk); + ok(hr == S_OK, "IMFAttributes_SetUnknown failed: 0x%08x\n", hr); + CHECK_COUNT(attributes, 5); + unk_value = NULL; + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID3, &IID_IUnknown, (void **)&unk_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUnknown failed: 0x%08x\n", hr); + IMFAttributes_Release(attributes); } -- 2.19.2

1 0

[PATCH 08/11] mfplat: Implement IMFattributes::{SetDouble, GetDouble}.
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 19 +++++++++++++++---- dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bc3b385b14..0b86843c2f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -622,10 +622,17 @@ static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_DOUBLE; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToDouble(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetGUID(IMFAttributes *iface, REFGUID key, GUID *value) @@ -817,10 +824,14 @@ static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %f\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %f)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = MF_ATTRIBUTE_DOUBLE; + attrval.dblVal = value; + return mfattribute_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetGUID(IMFAttributes *iface, REFGUID key, REFGUID value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 01cb1a3377..2e463d36ae 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -424,6 +424,7 @@ static void test_MFCreateAttributes(void) HRESULT hr; UINT32 uint32_value; UINT64 uint64_value; + double double_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -456,6 +457,15 @@ static void test_MFCreateAttributes(void) ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT32 should fail: 0x%08x.\n", hr); ok(uint32_value == 0xdeadbeef, "got wrong value: %d, expected: 0xdeadbeef.\n", uint32_value); + hr = IMFAttributes_SetDouble(attributes, &GUID_NULL, 22.0); + ok(hr == S_OK, "IMFAttributes_SetDouble failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); + + double_value = 0xdeadbeef; + hr = IMFAttributes_GetDouble(attributes, &GUID_NULL, &double_value); + ok(hr == S_OK, "IMFAttributes_GetDouble failed: 0x%08x.\n", hr); + ok(double_value == 22.0, "got wrong value: %f, expected: 22.0.\n", double_value); + IMFAttributes_Release(attributes); } -- 2.19.2

1 0

[PATCH 09/11] propsys: Partially implement PropVariantToString().
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 38 ++++++++++++++++ dlls/propsys/tests/propsys.c | 87 ++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 9193f3664d..d9347e27ae 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -133,7 +133,7 @@ @ stub PropVariantToInt64VectorAlloc @ stub PropVariantToInt64WithDefault @ stub PropVariantToStrRet -@ stub PropVariantToString +@ stdcall PropVariantToString(ptr ptr long) @ stdcall PropVariantToStringAlloc(ptr ptr) @ stub PropVariantToStringVector @ stub PropVariantToStringVectorAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 0edf4621b3..22ea3251f8 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -34,6 +34,7 @@ #include "winuser.h" #include "shlobj.h" #include "propvarutil.h" +#include "strsafe.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -305,6 +306,43 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) return hr; } +HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch) +{ + HRESULT hr = S_OK; + + TRACE("(%p, %p, %d): semi-stub\n", propvarIn, ret, cch); + + ret[0] = '\0'; + + if(!cch) + return E_INVALIDARG; + + switch(propvarIn->vt) + { + case VT_NULL: + case VT_EMPTY: + break; + case VT_BSTR: + case VT_LPWSTR: + if(lstrlenW(propvarIn->u.pwszVal) > cch) + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + else + lstrcpyW(ret, propvarIn->u.pwszVal); + break; + case VT_LPSTR: + if(strlen(propvarIn->u.pszVal) > cch) + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + else + MultiByteToWideChar(CP_ACP, 0, propvarIn->u.pszVal, -1, ret, cch); + break; + default: + FIXME("Unsupported conversion (%d)\n", propvarIn->vt); + hr = E_FAIL; + break; + } + return hr; +} + HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) { WCHAR *res = NULL; diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index a9c0a7730b..6d64afa355 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -32,6 +32,7 @@ #include "initguid.h" #include "propsys.h" #include "propvarutil.h" +#include "strsafe.h" #include "wine/test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -1304,6 +1305,91 @@ static void test_PropVariantToDouble(void) ok(value == 8.0, "Unexpected value: %f.\n", value); } +static void test_PropVariantToString(void) +{ + PROPVARIANT propvar; + static CHAR string[] = {'T','e','s','t',0}; + static WCHAR stringW[] = {'W','i','n','e',0}; + WCHAR bufferW[256] = {0}; + HRESULT hr; + + PropVariantInit(&propvar); + propvar.vt = VT_EMPTY; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, 0); + ok(hr == E_INVALIDARG, "PropVariantToString should fail: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_EMPTY; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_NULL; + U(propvar).pwszVal = stringW; + bufferW[0] = 65; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 22; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + todo_wine ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + todo_wine ok(!strcmp_wa(bufferW, "22"), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_LPWSTR; + U(propvar).pwszVal = stringW; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_LPSTR; + U(propvar).pszVal = string; + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!strcmp_wa(bufferW, string), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_LPWSTR; + U(propvar).pwszVal = stringW; + hr = PropVariantToString(&propvar, bufferW, 1); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "PropVariantToString should fail: 0x%08x.\n", hr); + ok(!bufferW[0], "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_BSTR; + propvar.u.bstrVal = SysAllocString(stringW); + hr = PropVariantToString(&propvar, bufferW, ARRAY_SIZE(bufferW)); + ok(hr == S_OK, "PropVariantToString failed: 0x%08x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "got wrong string: \"%s\".\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + SysFreeString(propvar.u.bstrVal); + PropVariantClear(&propvar); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1320,4 +1406,5 @@ START_TEST(propsys) test_PropVariantToStringWithDefault(); test_InitPropVariantFromCLSID(); test_PropVariantToDouble(); + test_PropVariantToString(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 80f081cbc3..4fb12d87eb 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -79,6 +79,7 @@ HRESULT WINAPI PropVariantToUInt16(REFPROPVARIANT propvarIn, USHORT *ret); HRESULT WINAPI PropVariantToUInt32(REFPROPVARIANT propvarIn, ULONG *ret); HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret); HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret); +HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret); -- 2.19.2

1 0

[PATCH 06/11] mfplat: Implement IMFattributes::GetCount().
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 10 +++++++--- dlls/mfplat/tests/mfplat.c | 23 +++++++++++++---------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1d8b110a09..bc3b385b14 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -881,12 +881,16 @@ static HRESULT WINAPI mfattributes_GetCount(IMFAttributes *iface, UINT32 *items) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %p\n", This, items); + TRACE("(%p, %p)\n", This, items); + EnterCriticalSection(&This->lock); + if(items) - *items = 0; + *items = list_count(&This->attributes); + + LeaveCriticalSection(&This->lock); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 index, GUID *key, PROPVARIANT *value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7ae87c2fc1..01cb1a3377 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -408,28 +408,30 @@ static void test_MFCreateMediaEvent(void) IMFMediaEvent_Release(mediaevent); } +#define CHECK_COUNT(obj,expected) _check_count(obj, expected, __LINE__) +static void _check_count(IMFAttributes* obj, ULONG expected, int line) +{ + UINT32 count = 9999; + HRESULT hr; + hr = IMFAttributes_GetCount(obj, &count); + ok_(__FILE__,line)(hr == S_OK, "IMFAttributes_GetCount failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(count == expected, "got %d, expected %d.\n", count, expected); +} + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; HRESULT hr; - UINT32 count; UINT32 uint32_value; UINT64 uint64_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); - - count = 88; - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 0, "got %d\n", count); + CHECK_COUNT(attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: 0x%08x.\n", hr); - - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(count == 1, "got %d\n", count); + CHECK_COUNT(attributes, 1); uint32_value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); @@ -443,6 +445,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 1); hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); -- 2.19.2

1 0

[PATCH 03/11] propsys/tests: Add tests of IPropertyStore interface.
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/tests/propstore.c | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index a24d3e762b..e87787e947 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -34,6 +34,7 @@ #include "initguid.h" DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +DEFINE_GUID(DUMMY_GUID1, 0x12345678, 0x1234,0x1234, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) @@ -299,6 +300,64 @@ static void test_PSCreateMemoryPropertyStore(void) IPropertyStoreCache_Release(propstorecache); } +static void test_propertystore(void) +{ + IPropertyStore *propstore; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + PROPERTYKEY propkey; + DWORD count = 0; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(!count, "got wrong property count: %d, expected 0.\n", count); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + ret_propvar.vt = VT_I4; + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_I4, "got wrong property type: %x.\n", ret_propvar.vt); + ok(U(ret_propvar).lVal == 123, "got wrong value: %d, expected 123.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_EMPTY, "got wrong property type: %x.\n", ret_propvar.vt); + ok(!U(ret_propvar).lVal, "got wrong value: %d, expected 0.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + IPropertyStore_Release(propstore); +} + START_TEST(propstore) { CoInitialize(NULL); @@ -306,6 +365,7 @@ START_TEST(propstore) test_inmemorystore(); test_persistserialized(); test_PSCreateMemoryPropertyStore(); + test_propertystore(); CoUninitialize(); } -- 2.19.2

1 0

[PATCH 02/11] propsys: Implement PSCreateMemoryPropertyStore().
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 7 +++++ dlls/propsys/tests/propstore.c | 51 ++++++++++++++++++++++++++++++++++ include/propsys.idl | 1 + 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index bbc71654a8..19c5a24c92 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -65,7 +65,7 @@ @ stub PSCoerceToCanonicalValue @ stub PSCreateAdapterFromPropertyStore @ stub PSCreateDelayedMultiplexPropertyStore -@ stub PSCreateMemoryPropertyStore +@ stdcall PSCreateMemoryPropertyStore(ptr ptr) @ stub PSCreateMultiplexPropertyStore @ stub PSCreatePropertyChangeArray @ stub PSCreatePropertyStoreFromObject diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 1dbaee433f..65d157d0cc 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -509,3 +509,10 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) return S_OK; } + +HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + return PropertyStore_CreateInstance(NULL, riid, ppv); +} diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 3fe8613a8b..a24d3e762b 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -35,6 +35,15 @@ DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_inmemorystore(void) { IPropertyStoreCache *propcache; @@ -249,12 +258,54 @@ static void test_persistserialized(void) IPersistSerializedPropStorage_Release(serialized); } +static void test_PSCreateMemoryPropertyStore(void) +{ + IPropertyStore *propstore, *propstore1; + IPersistSerializedPropStorage *serialized; + IPropertyStoreCache *propstorecache; + HRESULT hr; + + /* PSCreateMemoryPropertyStore(&IID_IPropertyStore, NULL); crashes */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + EXPECT_REF(propstore, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPersistSerializedPropStorage, (void **)&serialized); + todo_wine ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + todo_wine ok(serialized != NULL, "got %p.\n", serialized); + EXPECT_REF(propstore, 1); + /* EXPECT_REF(serialized, 1); */ + /* IPersistSerializedPropStorage_Release(serialized); */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStoreCache, (void **)&propstorecache); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstorecache != NULL, "got %p.\n", propstore); + ok(propstorecache != (IPropertyStoreCache *)propstore, "pointer are equal: %p, %p.\n", propstorecache, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstorecache, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore1); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore1 != NULL, "got %p.\n", propstore); + ok(propstore1 != propstore, "pointer are equal: %p, %p.\n", propstore1, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstore1, 1); + EXPECT_REF(propstorecache, 1); + + IPropertyStore_Release(propstore1); + IPropertyStore_Release(propstore); + IPropertyStoreCache_Release(propstorecache); +} + START_TEST(propstore) { CoInitialize(NULL); test_inmemorystore(); test_persistserialized(); + test_PSCreateMemoryPropertyStore(); CoUninitialize(); } diff --git a/include/propsys.idl b/include/propsys.idl index 04d3fbf8a1..bdd67fa6a5 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -799,6 +799,7 @@ cpp_quote("#define PKEY_PIDSTR_MAX 10") cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") +cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") -- 2.19.2

1 0

[PATCH 01/11] ole32/tests: Test PropVariantCopy() with VT_UNKNOWN.
by Jactry Zeng 28 Dec '18

28 Dec '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/tests/propvariant.c | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 97c4eec4ca..8c9f79e8d6 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "windows.h" #include "wtypes.h" #include "ddeml.h" @@ -298,10 +300,55 @@ static void test_validtypes(void) } } +struct unk_impl +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_QueryInterface()\n"); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_AddRef()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_Release()\n"); + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + static void test_copy(void) { static char szTestString[] = "Test String"; static WCHAR wszTestString[] = {'T','e','s','t',' ','S','t','r','i','n','g',0}; + struct unk_impl unk_obj = {{&unk_vtbl}, 1}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; HRESULT hr; @@ -334,6 +381,17 @@ static void test_copy(void) hr = PropVariantClear(&propvarDst); ok(hr == S_OK, "PropVariantClear(...VT_LPSTR...) failed\n"); memset(&propvarSrc, 0, sizeof(propvarSrc)); + + propvarSrc.vt = VT_UNKNOWN; + U(propvarSrc).punkVal = &unk_obj.IUnknown_iface; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(U(propvarDst).punkVal == &unk_obj.IUnknown_iface, "Got wrong IUnknown pointer\n"); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); } struct _PMemoryAllocator_vtable { -- 2.19.2

1 0

[PATCH v2] include/winuser: Add PtInRect as inline version of common RECT helpers
by Gabriel Ivăncescu 28 Dec '18

28 Dec '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This one is used in a lot of code so it makes sense to be just like the others. include/winuser.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 693965a..5e51afd 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4049,7 +4049,6 @@ WINUSERAPI UINT WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UIN WINUSERAPI UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); -WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI HWND WINAPI RealChildWindowFromPoint(HWND,POINT); WINUSERAPI UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); WINUSERAPI UINT WINAPI RealGetWindowClassW(HWND,LPWSTR,UINT); @@ -4278,6 +4277,7 @@ WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); WINUSERAPI BOOL WINAPI InflateRect(LPRECT,INT,INT); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); WINUSERAPI BOOL WINAPI OffsetRect(LPRECT,INT,INT); +WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); @@ -4318,6 +4318,13 @@ static inline BOOL WINAPI OffsetRect(LPRECT rect, INT x, INT y) return TRUE; } +static inline BOOL WINAPI PtInRect(const RECT *rect, POINT pt) +{ + if (!rect) return FALSE; + return ((pt.x >= rect->left) && (pt.x < rect->right) && + (pt.y >= rect->top) && (pt.y < rect->bottom)); +} + static inline BOOL WINAPI SetRect(LPRECT rect, INT left, INT top, INT right, INT bottom) { if (!rect) return FALSE; -- 2.19.1

1 0

[PATCH] kernel32: CreateDirectory shouldn't return ERROR_ACCESS_DENIED for the root of the drive. (Resend)
by Dmitry Timoshkov 28 Dec '18

28 Dec '18

According to the testbot results CreateDirectory("C:\\", NULL) fails with ERROR_ACCESS_DENIED for not administrators. However with UAC enabled and not and administrator account I get ERROR_ALREADY_EXISTS in that case with Windows 7 64-bit running on real hardware. Moreover, Wine doesn't really perform any access checks in that case and blindly assumes that returning STATUS_ACCESS_DENIED is correct behaviour for the drive's root: dlls/ntdll/directory.c,lookup_unix_name(). This patch fixes an application that can't find its data files because after it receives ERROR_ACCESS_DENIED it stops further directory traversing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/directory.c | 43 +++++++++++++++++++++++++++++++++ dlls/ntdll/directory.c | 3 +-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 512dc6d22a..de78c61681 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -541,10 +541,53 @@ static void test_SetCurrentDirectoryA(void) ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %d\n", GetLastError() ); } +static void test_CreateDirectory_root(void) +{ + static const WCHAR drive_c_root[] = { 'C',':','\\',0 }; + static const WCHAR drive_c[] = { 'C',':',0 }; + char curdir[MAX_PATH]; + BOOL ret; + + GetCurrentDirectoryA(sizeof(curdir), curdir); + + ret = SetCurrentDirectoryA("C:\\"); + ok(ret, "SetCurrentDirectory error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:\\", NULL); + ok(!ret, "CreateDirectory should fail\n"); + if (GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("not an administrator\n"); + SetCurrentDirectoryA(curdir); + return; + } + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:", NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c_root, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetCurrentDirectoryA(curdir); +} + START_TEST(directory) { init(); + test_CreateDirectory_root(); + test_GetWindowsDirectoryA(); test_GetWindowsDirectoryW(); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c48b9e97ea..2719958f67 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2650,9 +2650,8 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer { if (!stat( unix_name, &st )) { - /* creation fails with STATUS_ACCESS_DENIED for the root of the drive */ if (disposition == FILE_CREATE) - return name_len ? STATUS_OBJECT_NAME_COLLISION : STATUS_ACCESS_DENIED; + return STATUS_OBJECT_NAME_COLLISION; return STATUS_SUCCESS; } } -- 2.19.2

1 0

[PATCH 1/3] d3d9: Fix Reset() with system memory buffers.
by Józef Kucia 27 Dec '18

27 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes a regression introduced by commit b18a53a5b44b651cde8e05200c75eacf54f49926. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46362 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/device.c | 15 +++++++++++++++ dlls/d3d9/tests/device.c | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 17f6565cbb1f..c1418e99118b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -875,6 +875,8 @@ static UINT WINAPI d3d9_device_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) { + struct d3d9_vertexbuffer *vertex_buffer; + struct d3d9_indexbuffer *index_buffer; struct wined3d_resource_desc desc; IDirect3DBaseTexture9 *texture; struct d3d9_surface *surface; @@ -886,6 +888,19 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) if (desc.resource_type != WINED3D_RTYPE_TEXTURE_2D) { + if (desc.bind_flags & WINED3D_BIND_VERTEX_BUFFER) + { + vertex_buffer = wined3d_resource_get_parent(resource); + if (vertex_buffer && vertex_buffer->draw_buffer) + return D3D_OK; + } + if (desc.bind_flags & WINED3D_BIND_INDEX_BUFFER) + { + index_buffer = wined3d_resource_get_parent(resource); + if (index_buffer && index_buffer->draw_buffer) + return D3D_OK; + } + WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); return D3DERR_INVALIDCALL; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6edf2b35b30d..bc8d7088d36e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1827,6 +1827,8 @@ static void test_reset(void) IDirect3DDevice9 *device2 = NULL; IDirect3DSwapChain9 *swapchain; struct device_desc device_desc; + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; DEVMODEW devmode; IDirect3D9 *d3d; D3DCAPS9 caps; @@ -2198,6 +2200,20 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); IDirect3DSurface9_Release(surface); + hr = IDirect3DDevice9_CreateVertexBuffer(device1, 16, 0, + D3DFVF_XYZ, D3DPOOL_SYSTEMMEM, &vb, NULL); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DVertexBuffer9_Release(vb); + + hr = IDirect3DDevice9_CreateIndexBuffer(device1, 16, 0, + D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib, NULL); + ok(hr == D3D_OK, "Failed to create index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DIndexBuffer9_Release(ib); + /* The depth stencil should get reset to the auto depth stencil when present. */ hr = IDirect3DDevice9_SetDepthStencilSurface(device1, NULL); ok(hr == D3D_OK, "SetDepthStencilSurface failed with 0x%08x\n", hr); -- 2.20.1

3 8

[PATCH] comctl32/listview: Implement GetSelectedColumn
by Isira Seneviratne 27 Dec '18

27 Dec '18

2 1

[PATCH] po: Update Sinhala translation.
by Isira Seneviratne 27 Dec '18

27 Dec '18

1 0

[PATCH 1/2] urlmon/tests: Add test for opening cache file with DELETE access.
by Zebediah Figura 26 Dec '18

26 Dec '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/urlmon/tests/url.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 893632fd2e..ada78c930b 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -182,6 +182,7 @@ static HRESULT abort_hres; static BOOL have_IHttpNegotiate2, use_bscex, is_async_prot; static BOOL test_redirect, use_cache_file, callback_read, no_callback, test_abort; static WCHAR cache_file_name[MAX_PATH]; +static WCHAR http_cache_file[MAX_PATH]; static BOOL only_check_prot_args = FALSE; static BOOL invalid_cn_accepted = FALSE; static BOOL abort_start = FALSE; @@ -1927,6 +1928,14 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES ok( WaitForSingleObject(complete_event2, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); } + if(test_protocol == HTTP_TEST && !emulate_protocol && http_cache_file[0]) { + HANDLE file = CreateFileW(http_cache_file, DELETE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file == INVALID_HANDLE_VALUE, "expected INVALID_HANDLE_VALUE, got %p\n", file); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "expected ERROR_SHARING_VIOLATION, got %u\n", GetLastError()); + http_cache_file[0] = 0; + } + return S_OK; } @@ -2083,6 +2092,8 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW else if(emulate_protocol) ok(!lstrcmpW(pstgmed->u.lpszFileName, cache_fileW), "unexpected file name %s\n", wine_dbgstr_w(pstgmed->u.lpszFileName)); + else if(test_protocol == HTTP_TEST) + lstrcpyW(http_cache_file, pstgmed->u.lpszFileName); else ok(pstgmed->u.lpszFileName != NULL, "lpszFileName == NULL\n"); } -- 2.14.1

2 2

[PATCH] include/winuser: Add CopyRect and PtInRect as inline versions of common RECT helpers
by Gabriel Ivăncescu 26 Dec '18

26 Dec '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- There shouldn't be a reason they aren't there like the rest, since they're very simple functions. include/winuser.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 693965a..c9e90c2 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3549,7 +3549,6 @@ WINUSERAPI INT WINAPI CopyAcceleratorTableW(HACCEL,LPACCEL,INT); #define CopyCursor(cur) ((HCURSOR)CopyIcon((HICON)(cur))) WINUSERAPI HICON WINAPI CopyIcon(HICON); WINUSERAPI HANDLE WINAPI CopyImage(HANDLE,UINT,INT,INT,UINT); -WINUSERAPI BOOL WINAPI CopyRect(RECT*,const RECT*); WINUSERAPI INT WINAPI CountClipboardFormats(void); WINUSERAPI HACCEL WINAPI CreateAcceleratorTableA(LPACCEL,INT); WINUSERAPI HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,INT); @@ -4049,7 +4048,6 @@ WINUSERAPI UINT WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UIN WINUSERAPI UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); -WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI HWND WINAPI RealChildWindowFromPoint(HWND,POINT); WINUSERAPI UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); WINUSERAPI UINT WINAPI RealGetWindowClassW(HWND,LPWSTR,UINT); @@ -4274,10 +4272,12 @@ WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list); #if !defined(__WINESRC__) || defined(WINE_NO_INLINE_RECT) +WINUSERAPI BOOL WINAPI CopyRect(RECT*,const RECT*); WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); WINUSERAPI BOOL WINAPI InflateRect(LPRECT,INT,INT); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); WINUSERAPI BOOL WINAPI OffsetRect(LPRECT,INT,INT); +WINUSERAPI BOOL WINAPI PtInRect(const RECT*,POINT); WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); @@ -4285,6 +4285,13 @@ WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); /* Inline versions of common RECT helpers */ +static inline BOOL WINAPI CopyRect(RECT *dest, const RECT *src) +{ + if (!dest || !src) return FALSE; + *dest = *src; + return TRUE; +} + static inline BOOL WINAPI EqualRect(const RECT *rect1, const RECT *rect2) { if (!rect1 || !rect2) return FALSE; @@ -4318,6 +4325,13 @@ static inline BOOL WINAPI OffsetRect(LPRECT rect, INT x, INT y) return TRUE; } +static inline BOOL WINAPI PtInRect(const RECT *rect, POINT pt) +{ + if (!rect) return FALSE; + return ((pt.x >= rect->left) && (pt.x < rect->right) && + (pt.y >= rect->top) && (pt.y < rect->bottom)); +} + static inline BOOL WINAPI SetRect(LPRECT rect, INT left, INT top, INT right, INT bottom) { if (!rect) return FALSE; -- 2.19.1

2 2

[PATCH] comctl32/listview: Implement GetSelectedColumn
by Isira Seneviratne 26 Dec '18

26 Dec '18

2 1

[PATCH] po: Remove double spaces from English (United States) translation.
by Isira Seneviratne 25 Dec '18

25 Dec '18

3 2

[PATCH] po: Remove double spaces from English (United States) translation.
by Isira Seneviratne 25 Dec '18

25 Dec '18

2 1

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 25 Dec '18

25 Dec '18

From: Mingcong Bai <jeffbai(a)aosc.io> Signed-off-by: Mingcong Bai <jeffbai(a)aosc.io> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 420 +++++++++++++++++++++++++--------------------------- 1 file changed, 200 insertions(+), 220 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 6d731d3a7a..34af3ca7a2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-11-21 10:10-0600\n" -"Last-Translator: Mingcong Bai <jeffbai(a)aosc.xyz>\n" +"PO-Revision-Date: 2018-12-21 11:21-0600\n" +"Last-Translator: Mingcong Bai <jeffbai(a)aosc.io>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.9\n" +"X-Generator: Poedit 2.1.1\n" "Plural-Forms: nplurals=1; plural=0;\n" #: appwiz.rc:58 @@ -8980,811 +8980,791 @@ msgstr "选择来源" #: tzres.rc:82 msgid "China Standard Time" -msgstr "" +msgstr "中国标准时间" #: tzres.rc:83 msgid "China Daylight Time" -msgstr "" +msgstr "中国夏令时" #: tzres.rc:160 msgid "North Asia Standard Time" -msgstr "" +msgstr "北亚标准时间" #: tzres.rc:161 msgid "North Asia Daylight Time" -msgstr "" +msgstr "北亚夏令时" #: tzres.rc:104 msgid "Georgian Standard Time" -msgstr "" +msgstr "格鲁吉亚标准时间" #: tzres.rc:105 msgid "Georgian Daylight Time" -msgstr "" +msgstr "格鲁吉亚夏令时" #: tzres.rc:152 msgid "Nepal Standard Time" -msgstr "" +msgstr "尼泊尔标准时间" #: tzres.rc:153 msgid "Nepal Daylight Time" -msgstr "" +msgstr "尼泊尔夏令时" #: tzres.rc:60 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "佛得角标准时间" #: tzres.rc:61 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "佛得角夏令时" #: tzres.rc:74 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "中欧语言" +msgstr "中欧标准时间" #: tzres.rc:75 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "中欧语言" +msgstr "中欧夏令时" #: tzres.rc:140 msgid "Morocco Standard Time" -msgstr "" +msgstr "摩洛哥标准时间" #: tzres.rc:141 msgid "Morocco Daylight Time" -msgstr "" +msgstr "摩洛哥夏令时" #: tzres.rc:72 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "中欧语言" +msgstr "中欧标准时间" #: tzres.rc:73 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "中欧语言" +msgstr "中欧夏令时" #: tzres.rc:118 msgid "Iran Standard Time" -msgstr "" +msgstr "伊朗标准时间" #: tzres.rc:119 msgid "Iran Daylight Time" -msgstr "" +msgstr "伊朗夏令时" #: tzres.rc:150 msgid "Namibia Standard Time" -msgstr "" +msgstr "纳米比亚标准时间" #: tzres.rc:151 msgid "Namibia Daylight Time" -msgstr "" +msgstr "纳米比亚夏令时" #: tzres.rc:200 msgid "Tonga Standard Time" -msgstr "" +msgstr "汤加标准时间" #: tzres.rc:201 msgid "Tonga Daylight Time" -msgstr "" +msgstr "汤加夏令时" #: tzres.rc:144 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "山地标准时间（墨西哥）" #: tzres.rc:145 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "山地夏令时（墨西哥）" #: tzres.rc:106 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "标准栏(&S)" +msgstr "格林尼治标准时间" #: tzres.rc:107 msgid "GMT Daylight Time" -msgstr "" +msgstr "格林尼治夏令时" #: tzres.rc:68 msgid "Central Asia Standard Time" -msgstr "" +msgstr "中亚标准时间" #: tzres.rc:69 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "中亚夏令时" #: tzres.rc:38 msgid "Arabic Standard Time" -msgstr "" +msgstr "阿拉伯标准时间" #: tzres.rc:39 msgid "Arabic Daylight Time" -msgstr "" +msgstr "阿拉伯夏令时" #: tzres.rc:132 msgid "Magadan Standard Time" -msgstr "" +msgstr "马加丹标准时间" #: tzres.rc:133 msgid "Magadan Daylight Time" -msgstr "" +msgstr "马加丹夏令时" #: tzres.rc:156 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "纽芬兰标准时间" #: tzres.rc:157 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "纽芬兰夏令时" #: tzres.rc:224 msgid "West Pacific Standard Time" -msgstr "" +msgstr "西太平洋标准时间" #: tzres.rc:225 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "西太平洋夏令时" #: tzres.rc:164 msgid "Pacific Standard Time" -msgstr "" +msgstr "太平洋标准时间" #: tzres.rc:165 msgid "Pacific Daylight Time" -msgstr "" +msgstr "太平洋夏令时" #: tzres.rc:48 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "阿塞拜疆标准时间" #: tzres.rc:49 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "阿塞拜疆夏令时" #: tzres.rc:182 msgid "Samoa Standard Time" -msgstr "" +msgstr "萨摩亚标准时间" #: tzres.rc:183 msgid "Samoa Daylight Time" -msgstr "" +msgstr "萨摩亚夏令时" #: tzres.rc:124 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "加里宁格勒标准时间" #: tzres.rc:125 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "加里宁格勒夏令时" #: tzres.rc:166 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "太平洋标准时间（墨西哥）" #: tzres.rc:167 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "太平洋夏令时（墨西哥）" #: tzres.rc:136 msgid "Middle East Standard Time" -msgstr "" +msgstr "中东标准时间" #: tzres.rc:137 msgid "Middle East Daylight Time" -msgstr "" +msgstr "中东夏令时" #: tzres.rc:198 msgid "Tokyo Standard Time" -msgstr "" +msgstr "东京标准时间" #: tzres.rc:199 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "东京夏令时" #: tzres.rc:130 msgid "Line Islands Standard Time" -msgstr "" +msgstr "莱恩群岛标准时间" #: tzres.rc:131 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "莱恩群岛夏令时" #: tzres.rc:122 msgid "Jordan Standard Time" -msgstr "" +msgstr "约旦标准时间" #: tzres.rc:123 msgid "Jordan Daylight Time" -msgstr "" +msgstr "约旦夏令时" #: tzres.rc:78 msgid "Central Standard Time" -msgstr "" +msgstr "中部标准时间" #: tzres.rc:79 msgid "Central Daylight Time" -msgstr "" +msgstr "中部夏令时" #: tzres.rc:50 msgid "Azores Standard Time" -msgstr "" +msgstr "亚速尔群岛标准时间" #: tzres.rc:51 msgid "Azores Daylight Time" -msgstr "" +msgstr "亚速尔群岛夏令时" #: tzres.rc:158 msgid "North Asia East Standard Time" -msgstr "" +msgstr "北亚东部标准时间" #: tzres.rc:159 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "北亚东部夏令时" #: tzres.rc:40 msgid "Argentina Standard Time" -msgstr "" +msgstr "阿根廷标准时间" #: tzres.rc:41 msgid "Argentina Daylight Time" -msgstr "" +msgstr "阿根廷夏令时" #: tzres.rc:146 msgid "Myanmar Standard Time" -msgstr "" +msgstr "缅甸标准时间" #: tzres.rc:147 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "缅甸夏令时" #: tzres.rc:210 tzres.rc:211 msgid "Coordinated Universal Time" -msgstr "" +msgstr "协调世界时" #: tzres.rc:116 msgid "India Standard Time" -msgstr "" +msgstr "印度标准时间" #: tzres.rc:117 msgid "India Daylight Time" -msgstr "" +msgstr "印度夏令时" #: tzres.rc:112 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "标准栏(&S)" +msgstr "GTB 标准时间" #: tzres.rc:113 msgid "GTB Daylight Time" -msgstr "" +msgstr "GTB 夏令时" #: tzres.rc:202 msgid "Turkey Standard Time" -msgstr "" +msgstr "土耳其标准时间" #: tzres.rc:203 msgid "Turkey Daylight Time" -msgstr "" +msgstr "土耳其夏令时" #: tzres.rc:100 msgid "Fiji Standard Time" -msgstr "" +msgstr "斐济标准时间" #: tzres.rc:101 msgid "Fiji Daylight Time" -msgstr "" +msgstr "斐济夏令时" #: tzres.rc:58 msgid "Canada Central Standard Time" -msgstr "" +msgstr "加拿大中部标准时间" #: tzres.rc:59 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "加拿大中部夏令时" #: tzres.rc:194 msgid "Taipei Standard Time" -msgstr "" +msgstr "台北标准时间" #: tzres.rc:195 msgid "Taipei Daylight Time" -msgstr "" +msgstr "台北夏令时" #: tzres.rc:220 msgid "W. Europe Standard Time" -msgstr "" +msgstr "西欧标准时间" #: tzres.rc:221 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "西欧夏令时" #: tzres.rc:138 msgid "Montevideo Standard Time" -msgstr "" +msgstr "蒙得维的亚标准时间" #: tzres.rc:139 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "蒙得维的亚夏令时" #: tzres.rc:168 msgid "Pakistan Standard Time" -msgstr "" +msgstr "巴基斯坦标准时间" #: tzres.rc:169 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "巴基斯坦夏令时" #: tzres.rc:62 msgid "Caucasus Standard Time" -msgstr "" +msgstr "高加索标准时间" #: tzres.rc:63 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "高加索夏令时" #: tzres.rc:46 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "澳大利亚东部标准时间" #: tzres.rc:47 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "澳大利亚东部夏令时" #: tzres.rc:148 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "中北亚标准时间" #: tzres.rc:149 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "中北亚夏令时" #: tzres.rc:94 msgid "Eastern Standard Time" -msgstr "" +msgstr "东部标准时间" #: tzres.rc:95 msgid "Eastern Daylight Time" -msgstr "" +msgstr "东部夏令时" #: tzres.rc:80 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "中部标准时间（墨西哥）" #: tzres.rc:81 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "中部夏令时（墨西哥）" #: tzres.rc:42 msgid "Atlantic Standard Time" -msgstr "" +msgstr "大西洋标准时间" #: tzres.rc:43 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "大西洋夏令时" #: tzres.rc:142 msgid "Mountain Standard Time" -msgstr "" +msgstr "山地标准时间" #: tzres.rc:143 msgid "Mountain Daylight Time" -msgstr "" +msgstr "山地夏令时" #: tzres.rc:206 msgid "US Eastern Standard Time" -msgstr "" +msgstr "美国东部标准时间" #: tzres.rc:207 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "美国东部夏令时" #: tzres.rc:196 msgid "Tasmania Standard Time" -msgstr "" +msgstr "塔斯马尼亚标准时间" #: tzres.rc:197 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "塔斯马尼亚夏令时" #: tzres.rc:66 msgid "Central America Standard Time" -msgstr "" +msgstr "中美洲标准时间" #: tzres.rc:67 msgid "Central America Daylight Time" -msgstr "" +msgstr "中美洲夏令时" #: tzres.rc:208 msgid "US Mountain Standard Time" -msgstr "" +msgstr "美国山地标准时间" #: tzres.rc:209 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "美国山地夏令时" #: tzres.rc:188 msgid "South Africa Standard Time" -msgstr "" +msgstr "南非标准时间" #: tzres.rc:189 msgid "South Africa Daylight Time" -msgstr "" +msgstr "南非夏令时" #: tzres.rc:64 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "澳大利亚中部标准时间" #: tzres.rc:65 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "澳大利亚中部夏令时" #: tzres.rc:190 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "斯里兰卡标准时间" #: tzres.rc:191 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "斯里兰卡夏令时" #: tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "阿富汗标准时间" #: tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "阿富汗夏令时" #: tzres.rc:226 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "雅库次克标准时间" #: tzres.rc:227 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "雅库次克夏令时" #: tzres.rc:176 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "南美东部标准时间" #: tzres.rc:177 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "南美东部夏令时" #: tzres.rc:34 msgid "Arab Standard Time" -msgstr "" +msgstr "阿拉伯标准时间" #: tzres.rc:35 msgid "Arab Daylight Time" -msgstr "" +msgstr "阿拉伯夏令时" #: tzres.rc:36 msgid "Arabian Standard Time" -msgstr "" +msgstr "阿拉伯标准时间" #: tzres.rc:37 msgid "Arabian Daylight Time" -msgstr "" +msgstr "阿拉伯夏令时" #: tzres.rc:174 msgid "Russian Standard Time" -msgstr "" +msgstr "俄罗斯标准时间" #: tzres.rc:175 msgid "Russian Daylight Time" -msgstr "" +msgstr "俄罗斯夏令时" #: tzres.rc:172 msgid "Romance Standard Time" -msgstr "" +msgstr "罗曼标准时间" #: tzres.rc:173 msgid "Romance Daylight Time" -msgstr "" +msgstr "罗曼夏令时" #: tzres.rc:98 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "叶卡捷琳堡标准时间" #: tzres.rc:99 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "叶卡捷琳堡夏令时" #: tzres.rc:192 msgid "Syria Standard Time" -msgstr "" +msgstr "叙利亚标准时间" #: tzres.rc:193 msgid "Syria Daylight Time" -msgstr "" +msgstr "叙利亚夏令时" #: tzres.rc:44 msgid "AUS Central Standard Time" -msgstr "" +msgstr "澳大利亚中部标准时间" #: tzres.rc:45 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "澳大利亚中部夏令时" #: tzres.rc:110 msgid "Greenwich Standard Time" -msgstr "" +msgstr "格林威治标准时间" #: tzres.rc:111 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "格林威治夏令时" #: tzres.rc:204 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "乌兰巴托标准时间" #: tzres.rc:205 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "乌兰巴托夏令时" #: tzres.rc:120 msgid "Israel Standard Time" -msgstr "" +msgstr "以色列标准时间" #: tzres.rc:121 msgid "Israel Daylight Time" -msgstr "" +msgstr "以色列夏令时" #: tzres.rc:54 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "孟加拉标准时间" #: tzres.rc:55 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "孟加拉夏令时" #: tzres.rc:178 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "南美太平洋标准时间" #: tzres.rc:179 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "南美太平洋夏令时" #: tzres.rc:222 msgid "West Asia Standard Time" -msgstr "" +msgstr "西亚标准时间" #: tzres.rc:223 msgid "West Asia Daylight Time" -msgstr "" +msgstr "西亚夏令时" #: tzres.rc:32 msgid "Alaskan Standard Time" -msgstr "" +msgstr "阿拉斯加标准时间" #: tzres.rc:33 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "阿拉斯加夏令时" #: tzres.rc:170 msgid "Paraguay Standard Time" -msgstr "" +msgstr "巴拉圭标准时间" #: tzres.rc:171 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "巴拉圭夏令时" #: tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "日期和时间" +msgstr "日期变更线标准时间" #: tzres.rc:85 msgid "Dateline Daylight Time" -msgstr "" +msgstr "日期变更线夏令时" #: tzres.rc:128 msgid "Libya Standard Time" -msgstr "" +msgstr "利比亚标准时间" #: tzres.rc:129 msgid "Libya Daylight Time" -msgstr "" +msgstr "利比亚夏令时" #: tzres.rc:52 msgid "Bahia Standard Time" -msgstr "" +msgstr "巴伊亚标准时间" #: tzres.rc:53 msgid "Bahia Daylight Time" -msgstr "" +msgstr "巴伊亚夏令时" #: tzres.rc:212 msgid "Venezuela Standard Time" -msgstr "" +msgstr "委内瑞拉标准时间" #: tzres.rc:213 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "委内瑞拉夏令时" #: tzres.rc:114 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "夏威夷标准时间" #: tzres.rc:115 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "夏威夷夏令时" #: tzres.rc:184 msgid "SE Asia Standard Time" -msgstr "" +msgstr "东南亚标准时间" #: tzres.rc:185 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "东南亚夏令时" #: tzres.rc:154 msgid "New Zealand Standard Time" -msgstr "" +msgstr "新西兰标准时间" #: tzres.rc:155 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "新西兰夏令时" #: tzres.rc:70 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "巴西中部标准时间" #: tzres.rc:71 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "巴西中部夏令时" #: tzres.rc:56 msgid "Belarus Standard Time" -msgstr "" +msgstr "白罗斯标准时间" #: tzres.rc:57 msgid "Belarus Daylight Time" -msgstr "" +msgstr "白罗斯夏令时" #: tzres.rc:180 msgid "SA Western Standard Time" -msgstr "" +msgstr "南美西部标准时间" #: tzres.rc:181 msgid "SA Western Daylight Time" -msgstr "" +msgstr "南美西部夏令时" #: tzres.rc:108 msgid "Greenland Standard Time" -msgstr "" +msgstr "格陵兰标准时间" #: tzres.rc:109 msgid "Greenland Daylight Time" -msgstr "" +msgstr "格陵兰夏令时" #: tzres.rc:92 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "日期和时间" +msgstr "复活节岛标准时间" #: tzres.rc:93 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "日期和时间" +msgstr "复活节岛夏令时" #: tzres.rc:96 msgid "Egypt Standard Time" -msgstr "" +msgstr "埃及标准时间" #: tzres.rc:97 msgid "Egypt Daylight Time" -msgstr "" +msgstr "埃及夏令时" #: tzres.rc:134 msgid "Mauritius Standard Time" -msgstr "" +msgstr "毛里求斯标准时间" #: tzres.rc:135 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "毛里求斯夏令时" #: tzres.rc:214 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "符拉迪沃斯托克标准时间" #: tzres.rc:215 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "符拉迪沃斯托克夏令时" #: tzres.rc:186 msgid "Singapore Standard Time" -msgstr "" +msgstr "新加坡标准时间" #: tzres.rc:187 msgid "Singapore Daylight Time" -msgstr "" +msgstr "新加坡夏令时" #: tzres.rc:126 msgid "Korea Standard Time" -msgstr "" +msgstr "韩国标准时间" #: tzres.rc:127 msgid "Korea Daylight Time" -msgstr "" +msgstr "韩国夏令时" #: tzres.rc:86 msgid "E. Africa Standard Time" -msgstr "" +msgstr "东非标准时间" #: tzres.rc:87 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "东非夏令时" #: tzres.rc:102 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "标准栏(&S)" +msgstr "FLE 标准时间" #: tzres.rc:103 msgid "FLE Daylight Time" -msgstr "" +msgstr "FLE 夏令时" #: tzres.rc:90 msgid "E. South America Standard Time" -msgstr "" +msgstr "东南美洲标准时间" #: tzres.rc:91 msgid "E. South America Daylight Time" -msgstr "" +msgstr "东南美洲夏令时" #: tzres.rc:76 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "中太平洋标准时间" #: tzres.rc:77 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "中太平洋夏令时" #: tzres.rc:218 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "西中非标准时间" #: tzres.rc:219 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "西中非夏令时" #: tzres.rc:162 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "太平洋南美标准时间" #: tzres.rc:163 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "太平洋南美夏令时" #: tzres.rc:88 msgid "E. Australia Standard Time" -msgstr "" +msgstr "澳大利亚东部标准时间" #: tzres.rc:89 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "澳大利亚东部夏令时" #: tzres.rc:216 msgid "W. Australia Standard Time" -msgstr "" +msgstr "澳大利亚西部标准时间" #: tzres.rc:217 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "澳大利亚西部夏令时" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" -- 2.19.2

1 0

[PATCH] po: Add Sinhala translation.
by Isira Seneviratne 25 Dec '18

25 Dec '18

1 0

[PATCH] shell32/autocomplete: Always expand if the enumerator was reset
by Gabriel Ivăncescu 24 Dec '18

24 Dec '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Fixes a small and rare issue. This reuses the existing code for minimal changes. A simple test has been included in the patch because it was small enough. dlls/shell32/autocomplete.c | 8 +++++++- dlls/shell32/tests/autocomplete.c | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6c013a8..2cf5588 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -435,12 +435,18 @@ static BOOL aclist_expand(IAutoCompleteImpl *ac, WCHAR *txt) { /* call IACList::Expand only when needed, if the new txt and old_txt require different expansions */ - WCHAR c, *p, *last_delim, *old_txt = ac->txtbackup; + static const WCHAR empty[] = { 0 }; + + const WCHAR *old_txt = ac->txtbackup; + WCHAR c, *p, *last_delim; size_t i = 0; /* '/' is allowed as a delim for unix paths */ static const WCHAR delims[] = { '\\', '/', 0 }; + /* always expand if the enumerator was reset */ + if (!ac->enum_strs) old_txt = empty; + /* skip the shared prefix */ while ((c = tolowerW(txt[i])) == tolowerW(old_txt[i])) { diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 0da164b..b06d652 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -494,7 +494,7 @@ static void check_dropdown_(const char *file, UINT line, IAutoCompleteDropDown * } } -static void test_aclist_expand(HWND hwnd_edit, void *enumerator) +static void test_aclist_expand(HWND hwnd_edit, void *enumerator, IAutoCompleteDropDown *acdropdown) { struct string_enumerator *obj = (struct string_enumerator*)enumerator; static WCHAR str1[] = {'t','e','s','t',0}; @@ -502,6 +502,7 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) static WCHAR str2[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\','b','a',0}; static WCHAR str2a[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\',0}; static WCHAR str2b[] = {'t','e','s','t','\\','f','o','o','\\','b','a','r','\\','b','a','z','_','b','b','q','\\',0}; + HRESULT hr; obj->num_resets = 0; ok(obj->num_expand == 0, "Expected 0 expansions, got %u\n", obj->num_expand); @@ -546,6 +547,20 @@ static void test_aclist_expand(HWND hwnd_edit, void *enumerator) dispatch_messages(); ok(obj->num_expand == 4, "Expected 4 expansions, got %u\n", obj->num_expand); ok(obj->num_resets == 5, "Expected 5 resets, got %u\n", obj->num_resets); + SendMessageW(hwnd_edit, WM_SETTEXT, 0, (LPARAM)str1a); + SendMessageW(hwnd_edit, EM_SETSEL, ARRAY_SIZE(str1a) - 1, ARRAY_SIZE(str1a) - 1); + SendMessageW(hwnd_edit, WM_CHAR, 'f', 1); + dispatch_messages(); + ok(obj->num_expand == 5, "Expected 5 expansions, got %u\n", obj->num_expand); + ok(lstrcmpW(obj->last_expand, str1a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1a), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 6, "Expected 6 resets, got %u\n", obj->num_resets); + hr = IAutoCompleteDropDown_ResetEnumerator(acdropdown); + ok(hr == S_OK, "IAutoCompleteDropDown_ResetEnumerator failed: %x\n", hr); + SendMessageW(hwnd_edit, WM_CHAR, 'o', 1); + dispatch_messages(); + ok(obj->num_expand == 6, "Expected 6 expansions, got %u\n", obj->num_expand); + ok(lstrcmpW(obj->last_expand, str1a) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str1a), wine_dbgstr_w(obj->last_expand)); + ok(obj->num_resets == 7, "Expected 7 resets, got %u\n", obj->num_resets); } static void test_prefix_filtering(HWND hwnd_edit) @@ -775,7 +790,7 @@ static void test_custom_source(void) SendMessageW(hwnd_edit, WM_GETTEXT, ARRAY_SIZE(buffer), (LPARAM)buffer); ok(lstrcmpW(str_aut, buffer) == 0, "Expected %s, got %s\n", wine_dbgstr_w(str_aut), wine_dbgstr_w(buffer)); - test_aclist_expand(hwnd_edit, enumerator); + test_aclist_expand(hwnd_edit, enumerator, acdropdown); obj->num_resets = 0; hr = IAutoCompleteDropDown_ResetEnumerator(acdropdown); -- 2.19.1

1 0

[PATCH] shell32/autocomplete: Don't autoappend on Paste if ACO_AUTOAPPEND is off
by Gabriel Ivăncescu 24 Dec '18

24 Dec '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Fixes a minor issue. dlls/shell32/autocomplete.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6c013a8..679ec29 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -761,7 +761,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, return ret; case WM_PASTE: ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - autocomplete_text(This, hwnd, autoappend_flag_yes); + autocomplete_text(This, hwnd, (This->options & ACO_AUTOAPPEND) + ? autoappend_flag_yes : autoappend_flag_no); return ret; case WM_MOUSEWHEEL: if ((This->options & ACO_AUTOSUGGEST) && IsWindowVisible(This->hwndListBox)) -- 2.19.1

1 0

[PATCH] po: Add Sinhala translation.
by Isira Seneviratne 24 Dec '18

24 Dec '18

2 1

[PATCH] po: Add Sinhala translation.
by Isira Seneviratne 24 Dec '18

24 Dec '18

2 1

Re: [PATCH 3/3] po: Add Sinhala translation.
by Marvin 24 Dec '18

24 Dec '18

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=45915 Your paranoid android. === debian9 (build log) === Makefile:231: recipe for target 'appwiz.res' failed Makefile:8648: recipe for target 'dlls/appwiz.cpl' failed Makefile:528: recipe for target 'avifil32.res' failed Makefile:8648: recipe for target 'dlls/avifil32' failed Makefile:372: recipe for target 'browseui.res' failed Makefile:8648: recipe for target 'dlls/browseui' failed Task: The win32 build failed === debian9 (build log) === Makefile:230: recipe for target 'appwiz.res' failed Makefile:8371: recipe for target 'dlls/appwiz.cpl' failed Makefile:367: recipe for target 'browseui.res' failed Makefile:8371: recipe for target 'dlls/browseui' failed Makefile:519: recipe for target 'avifil32.res' failed Makefile:8371: recipe for target 'dlls/avifil32' failed Task: The wow64 build failed

1 0

[PATCH 2/3] po: Add Sinhala translation.
by Isira Seneviratne 24 Dec '18

24 Dec '18

2 1

[PATCH 1/3] po: Add Sinhala translation.
by Isira Seneviratne 24 Dec '18

24 Dec '18

2 1

[PATCH v2] wsdapi: Fix some memory leaks (Valgrind).
by Sven Baars 23 Dec '18

23 Dec '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v2: Fix a typo and fix some more memory leaks dlls/wsdapi/soap.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 2ecc01313f..aa8d15f4c5 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -1426,6 +1426,9 @@ static HRESULT ws_element_to_wsdxml_element(WS_XML_READER *reader, IWSDXMLContex if (FAILED(ret)) goto cleanup; WSDXMLAddChild(cur_element, element); + WSDFreeLinkedMemory(name); + name = NULL; + cur_wsd_attrib = NULL; /* Add attributes */ @@ -1462,6 +1465,9 @@ static HRESULT ws_element_to_wsdxml_element(WS_XML_READER *reader, IWSDXMLContex new_wsd_attrib->Element = cur_element; new_wsd_attrib->Next = NULL; + WSDAttachLinkedMemory(new_wsd_attrib, name); + name = NULL; + if (cur_wsd_attrib == NULL) element->FirstAttribute = new_wsd_attrib; else @@ -1524,6 +1530,7 @@ outofmemory: cleanup: /* Free uri and element_name if applicable */ WSDFreeLinkedMemory(uri); + WSDFreeLinkedMemory(name); return ret; } @@ -1712,10 +1719,10 @@ HRESULT read_message(IWSDiscoveryPublisherImpl *impl, const char *xml, int xml_l IWSDXMLContext *context = NULL; WS_XML_STRING *soap_uri = NULL; const WS_XML_NODE *node; - WS_XML_READER *reader; + WS_XML_READER *reader = NULL; LPCWSTR value = NULL; LPWSTR uri, prefix; - WS_HEAP *heap; + WS_HEAP *heap = NULL; HRESULT ret; int i; @@ -1945,6 +1952,8 @@ cleanup: free_xml_string(soap_uri); WSDFreeLinkedMemory(soap_msg); if (context != NULL) IWSDXMLContext_Release(context); + if (reader != NULL) WsFreeReader(reader); + if (heap != NULL) WsFreeHeap(heap); return ret; } -- 2.17.1

1 0

[PATCH] wsdapi/tests: Fix a memory leak (Valgrind).
by Sven Baars 23 Dec '18

23 Dec '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/wsdapi/tests/xml.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 633124f1b1..ab86d23166 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -604,6 +604,7 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Apparently wsdapi always leaves the namespace names array as empty */ ok(ns2->Names == NULL, "Names array is not empty\n"); ok(ns2->NamesCount == 0, "NamesCount is not 0 (value = %d)\n", ns2->NamesCount); + WSDFreeLinkedMemory(ns2); } IWSDXMLContext_Release(context); -- 2.17.1

2 2

Translation not appearing in patches list
by Isira Seneviratne 23 Dec '18

23 Dec '18

Hi, I sent a patch containing a translation I added a couple of days ago, but it hasn't appeared in the list of patches <https://source.winehq.org/patches/>. Is there a reason for this? Isira

3 2

Wine staging 4.0-rc3 release
by Alistair Leslie-Hughes 23 Dec '18

23 Dec '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 4.0-rc3 (831 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * user32: Dont reset focus if current dialog is a child. Added * [46300] mfplat: Implement MFGetSystemTime * [46105] mf: Implement MFCreateSequencerSource * [41929] wined3d: Multiple games need WINED3D_TEXF_ANISOTROPIC filter mode * [31157] imm32: Only generate 'WM_IME_SETCONTEXT' message if window has focus. * [46263] winex11: Final Fantasy XI crashes after accepting EULA when using Ashita * [7287] user32: Redundant "tabs" appear with tabbed MDI. Updated: * uianimation-stubs Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] gdi32: Fix fontconfig objects leak (Valgrind).
by Nikolay Sivov 22 Dec '18

22 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9f6bdfe49a..c38108eece 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5279,8 +5279,8 @@ found: TRACE("got %s\n", wine_dbgstr_w(nameW)); end: - if (!pat) pFcPatternDestroy(pat); - if (!best) pFcPatternDestroy(best); + pFcPatternDestroy(pat); + pFcPatternDestroy(best); return family; } #endif -- 2.19.2

2 1

UIRibbon continues
by Fabian Maurer 22 Dec '18

22 Dec '18

Hello wine-devel, I'm still investigating that file format that I mentioned some time ago (see https:// www.winehq.org/pipermail/wine-devel/2017-July/118544.html), but I'm progressing. In short, to implement uiribbon, we need to be able to parse a binary blob that specifies how the ribbon looks like and how it behaves. I'm currently at a state where my understanding is at least partially usable, and I wanted to start writing tests to cement my progress. However, I'd like to write it in a format that would be acceptable for wine upstream from the start. Most problematic is the parser for the binary blob, IMHO. Is there already something similar where I could take some hints regarding style? For example how to best handle the whole error checking thing, add debug logging or how to handle memory allocation/freeing. Regards, Fabian Maurer

3 4

[PATCH] quartz: Fix some memory leaks (Valgrind).
by Sven Baars 22 Dec '18

22 Dec '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/quartz/filesource.c | 6 +++--- dlls/quartz/filtergraph.c | 4 ++++ dlls/quartz/memallocator.c | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index e5904dc876..df444ae40d 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -493,7 +493,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) } CoTaskMemFree(This->pszFileName); if (This->pmt) - FreeMediaType(This->pmt); + DeleteMediaType(This->pmt); BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); return 0; @@ -610,7 +610,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi { CoTaskMemFree(This->pszFileName); if (This->pmt) - FreeMediaType(This->pmt); + DeleteMediaType(This->pmt); This->pszFileName = CoTaskMemAlloc((strlenW(pszFileName) + 1) * sizeof(WCHAR)); strcpyW(This->pszFileName, pszFileName); @@ -650,7 +650,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi CoTaskMemFree(This->pszFileName); if (This->pmt) - FreeMediaType(This->pmt); + DeleteMediaType(This->pmt); This->pszFileName = NULL; This->pmt = NULL; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7abffa5045..02707b4a5d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -687,6 +687,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte IBaseFilter_SetSyncSource(pFilter, NULL); IBaseFilter_Release(pFilter); list_remove(&entry->entry); + CoTaskMemFree(entry->name); heap_free(entry); This->version++; /* Invalidate interfaces in the cache */ @@ -1801,6 +1802,9 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR TRACE("MajorType %s\n", debugstr_guid(&mt.majortype)); TRACE("SubType %s\n", debugstr_guid(&mt.subtype)); + CoTaskMemFree(filename); + FreeMediaType(&mt); + if (ppFilter) *ppFilter = preader; IFileSourceFilter_Release(pfile); diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index f5ee3c29ef..477c63ae05 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -444,6 +444,9 @@ static HRESULT StdMediaSample2_Construct(BYTE * pbBuffer, LONG cbBuffer, IMemAll static void StdMediaSample2_Delete(StdMediaSample2 * This) { + if (This->props.pMediaType) + DeleteMediaType(This->props.pMediaType); + /* NOTE: does not remove itself from the list it belongs to */ CoTaskMemFree(This); } @@ -676,7 +679,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED if (This->props.pMediaType) { - FreeMediaType(This->props.pMediaType); + DeleteMediaType(This->props.pMediaType); This->props.pMediaType = NULL; } if (!pMediaType) -- 2.17.1

1 1

shlwapi: Remove dead code (coverity)
by André Hentschel 22 Dec '18

22 Dec '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shlwapi/shlwapi_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 795bf5570e2..fc1b6d6137f 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -61,9 +61,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) DisableThreadLibraryCalls(hinstDLL); shlwapi_hInstance = hinstDLL; break; - case DLL_PROCESS_DETACH: - if (fImpLoad) break; - break; } return TRUE; } -- 2.17.1

1 0

[PATCH 2/2] shlwapi: Remove dead code (coverity)
by André Hentschel 22 Dec '18

22 Dec '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/shlwapi/shlwapi_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 795bf5570e2..fc1b6d6137f 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -61,9 +61,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) DisableThreadLibraryCalls(hinstDLL); shlwapi_hInstance = hinstDLL; break; - case DLL_PROCESS_DETACH: - if (fImpLoad) break; - break; } return TRUE; } -- 2.17.1

1 0

[PATCH 1/2] ntoskrnl.exe: Avoid loading a driver multiple times in ZwLoadDriver().
by Zebediah Figura 21 Dec '18

21 Dec '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45805 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/tests/driver.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2b3b2ec0ef..d0112f4904 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3520,6 +3520,13 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) return STATUS_NO_MEMORY; } + if (wine_rb_get( &wine_drivers, &drv_name )) + { + TRACE( "driver %s already loaded\n", debugstr_us(&drv_name) ); + RtlFreeUnicodeString( &drv_name ); + return STATUS_IMAGE_ALREADY_LOADED; + } + set_service_status( service_handle, SERVICE_START_PENDING, 0 ); status = IoCreateDriver( &drv_name, init_driver ); diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 17e54cd508..6ab5c3e054 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -206,6 +206,9 @@ static void test_load_driver(void) ret = ZwLoadDriver(&name); ok(!ret, "got %#x\n", ret); + ret = ZwLoadDriver(&name); + ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret); + ret = ZwUnloadDriver(&name); ok(!ret, "got %#x\n", ret); } -- 2.14.1

1 1

[PATCH] ntdll: Use correct PC for instruction decoding on ARM64
by André Hentschel 21 Dec '18

21 Dec '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46194 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c976884ff01..e1958890af2 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -611,9 +611,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f return STATUS_SUCCESS; } -static inline DWORD is_write_fault( ucontext_t *context ) +static inline DWORD is_write_fault( DWORD *pc ) { - DWORD inst = *(DWORD *)PC_sig(context); + DWORD inst = *pc; if ((inst & 0xbfff0000) == 0x0c000000 /* C3.3.1 */ || (inst & 0xbfe00000) == 0x0c800000 /* C3.3.2 */ || (inst & 0xbfdf0000) == 0x0d000000 /* C3.3.3 */ || @@ -637,6 +637,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD *rec; ucontext_t *context = ucontext; + DWORD *orig_pc = PC_sig(context); /* check for page fault inside the thread stack */ if (signal == SIGSEGV && @@ -664,7 +665,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case SIGSEGV: /* Segmentation fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - rec->ExceptionInformation[0] = is_write_fault(context); + rec->ExceptionInformation[0] = is_write_fault(orig_pc); rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; break; case SIGBUS: /* Alignment check exception */ -- 2.17.1

1 0

[PATCH] riched20: Mask out extended flags introduced by CHARFORMAT2 when converting to CHARFORMAT.
by Sergio Gómez Del Real 21 Dec '18

21 Dec '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/riched20/style.c | 4 ++++ dlls/riched20/tests/editor.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index c3f3fc3f9a..3b9d7717eb 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -85,6 +85,8 @@ BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(CP_ACP, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), NULL, NULL); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ + t->dwMask &= CFM_ALL; + t->dwEffects &= CFM_EFFECTS; return TRUE; } if (to->cbSize == sizeof(CHARFORMATW)) @@ -92,6 +94,8 @@ BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) CHARFORMATW *t = (CHARFORMATW *)to; CopyMemory(t, from, sizeof(*t)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ + t->dwMask &= CFM_ALL; + t->dwEffects &= CFM_EFFECTS; return TRUE; } if (to->cbSize == sizeof(CHARFORMAT2A)) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 035869e134..410960bd3c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -751,6 +751,8 @@ static void test_EM_SETCHARFORMAT(void) HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2A cf2; CHARFORMAT2W cfW; + CHARFORMATA cf1a; + CHARFORMATW cf1w; int rc = 0; int tested_effects[] = { CFE_BOLD, @@ -1338,6 +1340,23 @@ static void test_EM_SETCHARFORMAT(void) ok(cf2.dwEffects & CFE_UNDERLINE, "got %08x\n", cf2.dwEffects); ok(cf2.bUnderlineType == CFU_UNDERLINEDOUBLE, "got %x\n", cf2.bUnderlineType); + /* Wine converts between CHARFORMAT(A/W) and CHARFORMAT2W internally. Test that. */ + memset(&cf1a, 0, sizeof(CHARFORMATA)); + memset(&cf1w, 0, sizeof(CHARFORMATW)); + cf1a.cbSize = sizeof(CHARFORMATA); + cf1w.cbSize = sizeof(CHARFORMATW); + cf1a.dwMask = cf1w.dwMask = CFM_ALL2; + cf1a.dwEffects = cf1w.dwEffects = CFM_EFFECTS2; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1a); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1a); + /* flags only valid for CHARFORMAT2 should be masked out */ + ok((cf1a.dwMask & (CFM_ALL2&~CFM_ALL)) == 0, "flags were not masked out\n"); + ok((cf1a.dwEffects & (CFM_EFFECTS2&~CFM_EFFECTS)) == 0, "flags were not masked out\n"); + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1w); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1w); + ok((cf1w.dwMask & (CFM_ALL2&~CFM_ALL)) == 0, "flags were not masked out\n"); + ok((cf1w.dwEffects & (CFM_EFFECTS2&~CFM_EFFECTS)) == 0, "flags were not masked out\n"); + DestroyWindow(hwndRichEdit); } -- 2.17.1

1 0

[PATCH 2/2 v2] msvcrt: Use GetDaylightFlag() to set dstflag value in _ftime64.
by Piotr Caban 21 Dec '18

21 Dec '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

2 3

[PATCH] ping: Add Ctrl+C event handling
by Isira Seneviratne 21 Dec '18

21 Dec '18

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-devel