- Wine-devel - list.winehq.org

[PATCH] wine.inf: Enable Light theme by default.
by Zhiyi Zhang 18 Mar '22

18 Mar '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- loader/wine.inf.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 0e488d87dcb..3e6194a3929 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -71,6 +71,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ LicenseInformation @@ -95,6 +96,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ VersionInfo,\ LicenseInformation @@ -121,6 +123,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ VersionInfo.ntamd64,\ LicenseInformation @@ -147,6 +150,7 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ + ThemeManager,\ Timezones,\ VersionInfo.ntamd64,\ LicenseInformation @@ -5494,6 +5498,12 @@ ServiceType=32 StartType=3 ErrorControl=1 +[ThemeManager] +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","ThemeActive",2,"1" +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","DllName",2,"%10%\resources\themes\light\light.msstyles" +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","ColorName",2,"Blue" +HKCU,"Software\Microsoft\Windows\CurrentVersion\ThemeManager","SizeName",2,"NormalSize" + [WinmgmtService] Description="Provides access to Windows Management Instrumentation" DisplayName="Windows Management Instrumentation Service" -- 2.32.0

3 4

Re: [PATCH vkd3d v3 2/8] vkd3d-shader/hlsl: Add default writemask for matrix stores.
by Zebediah Figura 17 Mar '22

17 Mar '22

On 3/7/22 09:09, Francisco Casas wrote: > Hello, > > March 4, 2022 10:01 PM, "Zebediah Figura (she/her)" <zfigura(a)codeweavers.com> wrote: > >> On 3/2/22 12:31, Francisco Casas wrote: >> >>> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> >>> --- >>> v3: >>> - This patch is new. >>> - While we don't use the default writemask for matrices (yet), >>> I think it is good for consistency, since we are getting rid >>> of the type_is_single_reg() function. >>> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> >>> --- >>> libs/vkd3d-shader/hlsl.c | 12 ++++++++---- >>> 1 file changed, 8 insertions(+), 4 deletions(-) >>> diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c >>> index 00a374b4..5152aec4 100644 >>> --- a/libs/vkd3d-shader/hlsl.c >>> +++ b/libs/vkd3d-shader/hlsl.c >>> @@ -527,9 +527,13 @@ struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char >>> *nam >>> return var; >>> } >>>> -static bool type_is_single_reg(const struct hlsl_type *type) >>> +static unsigned int type_default_writemask(const struct hlsl_type *type) >>> - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; >>> + if (type->type == HLSL_CLASS_MATRIX && hlsl_type_is_row_major(type)) >>> + return (1 << type->dimy) - 1; >> >> I don't understand the logic here. A nonzero writemask should encompass the whole type, which this >> does not. Why do we need this? >> > > Well, I am not totally sure this patch is actually necessary, I just > thought it could be a good default behavior since we are getting rid of > hlsl_is_single_reg(), but maybe I am overthinking... FWIW, I don't know that that instance of type_is_single_reg() necessarily needs to go away. Although given 1/8, we could certainly say that a zero writemask always means the whole variable, and let hlsl_reg_from_deref() deal with that even for scalar and vector types. > > As you know, if we have a HLSL_IR_STORE with a whole matrix in the rhs, > we have to split it in up to 4 stores, each one with a writemask that > matches the result of this type_default_writemask() here. Well, yeah, but we should be using the result type in that case, i.e. vectors rather than matrices. > > The patch from Giovanni that implements this split_matrix_copies() > pass (which is many patches ahead), makes sure to do it with only vectors > in the rhs. > > But currently, if I am not mistaken (I could be), a HLSL_IR_STORE with a > matrix in the rhs is producing a single MOV instruction for the first > register that the matrix uses. Which maybe could be problematic in sm4 > with matrices with major size =1 and minor size <4. Currently it's not producing anything, actually; we have a FIXME for that case in write_sm[14]_instructions(). > > I added this default behavior thinking on those cases (if they could actually > happen), and maybe because I thought it could be useful in the future if for > some reason we wanted to implement split_matrix_copies() in other way, by > directly copying the store instructions. > > But well, maybe I'll just do > --- > if (!writemask && (type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR)) > writemask = (1 << rhs->data_type->dimx) - 1; > --- > or remove the patch altogether in the next version of the batch. > > > Best regards, > Francisco

2 1

[PATCH vkd3d v3 1/8] vkd3d-shader/hlsl: Allow offsets for scalar and vector variables.
by Francisco Casas 17 Mar '22

17 Mar '22

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - In v3, this patch replaces vkd3d-shader/hlsl: Move type_is_single_reg() to hlsl.h and rename it to hlsl_type_uses_writemask(). This in order to simplify numeric variable initializations later. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 3 +-- libs/vkd3d-shader/hlsl_codegen.c | 22 +++++----------------- libs/vkd3d-shader/hlsl_sm1.c | 4 ++-- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++++----- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 243ed72b..1fd5dc58 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -793,8 +793,7 @@ unsigned int hlsl_swizzle_from_writemask(unsigned int writemask); bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset); unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type); +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref); bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 837d39e3..d25e0ff5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1542,11 +1542,6 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) } } -static bool type_is_single_reg(const struct hlsl_type *type) -{ - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; -} - bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, unsigned int *offset) { struct hlsl_ir_node *offset_node = deref->offset.node; @@ -1589,8 +1584,7 @@ unsigned int hlsl_offset_from_deref_safe(struct hlsl_ctx *ctx, const struct hlsl return 0; } -struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref, - const struct hlsl_type *type) +struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref) { const struct hlsl_ir_var *var = deref->var; struct hlsl_reg ret = var->reg; @@ -1598,16 +1592,10 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere ret.id += offset / 4; - if (type_is_single_reg(var->data_type)) - { - assert(!offset); - ret.writemask = var->reg.writemask; - } - else - { - assert(type_is_single_reg(type)); - ret.writemask = ((1 << type->dimx) - 1) << (offset % 4); - } + ret.writemask = 0xf & (0xf << (offset % 4)); + if (var->reg.writemask) + ret.writemask = hlsl_combine_writemasks(var->reg.writemask, ret.writemask); + return ret; } diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 90ec6058..f661dbc2 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -663,7 +663,7 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b static void write_sm1_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_load *load = hlsl_ir_load(instr); - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src, instr->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &load->src); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, @@ -707,7 +707,7 @@ static void write_sm1_store(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * { const struct hlsl_ir_store *store = hlsl_ir_store(instr); const struct hlsl_ir_node *rhs = store->rhs.node; - const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs, rhs->data_type); + const struct hlsl_reg reg = hlsl_reg_from_deref(ctx, &store->lhs); struct sm1_instruction sm1_instr = { .opcode = D3DSIO_MOV, diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6996bb2d..802db3c1 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -870,6 +870,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -877,11 +879,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_INPUT; @@ -899,6 +901,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, swizzle_type, &has_idx)) { + unsigned int offset = hlsl_offset_from_deref_safe(ctx, deref); + if (has_idx) { reg->idx[0] = var->semantic.index; @@ -909,11 +913,11 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r reg->dim = VKD3D_SM4_DIMENSION_SCALAR; else reg->dim = VKD3D_SM4_DIMENSION_VEC4; - *writemask = (1u << data_type->dimx) - 1; + *writemask = ((1u << data_type->dimx) - 1) << (offset % 4); } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_OUTPUT; @@ -925,7 +929,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r } else { - struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref, data_type); + struct hlsl_reg hlsl_reg = hlsl_reg_from_deref(ctx, deref); assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_TEMP; -- 2.25.1

3 2

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 17 Mar '22

17 Mar '22

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 104 ++++++++++++++++++------------------------------------- 1 file changed, 33 insertions(+), 71 deletions(-) diff --git a/po/fi.po b/po/fi.po index de3434f4d3d..be14b9b2ebd 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: 2020-06-17 12:10+0300\n" +"PO-Revision-Date: 2022-03-17 20:32+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -10519,16 +10519,16 @@ msgstr "(UTC-03:00) Saint-Pierre ja Miquelon" #: dlls/tzres/tzres.rc:327 msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" -msgstr "Sao Tomen normaaliaika" +msgstr "São Tomén normaaliaika" #: dlls/tzres/tzres.rc:328 msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" -msgstr "Sao Tomen kesäaika" +msgstr "São Tomén kesäaika" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "(UTC+00:00) Sao Tome" +msgstr "(UTC+00:00) São Tomé" #: dlls/tzres/tzres.rc:249 msgctxt "maximum 31 characters" @@ -10559,18 +10559,14 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 -#, fuzzy -#| msgid "Mountain Standard Time (Mexico)" msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" -msgstr "Kalliovuorten normaaliaika (Meksiko)" +msgstr "Kalliovuorten norm.aika (Meks.)" #: dlls/tzres/tzres.rc:241 -#, fuzzy -#| msgid "Mountain Daylight Time (Mexico)" msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" -msgstr "Kalliovuorten kesäaika (Meksiko)" +msgstr "Kalliovuorten kesäaika (Meks.)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" @@ -10782,11 +10778,9 @@ msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 -#, fuzzy -#| msgid "Pacific Standard Time (Mexico)" msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" -msgstr "Tyynenmeren normaaliaika (Meksiko)" +msgstr "Tyynenmeren norm.aika (Meksiko)" #: dlls/tzres/tzres.rc:283 msgctxt "maximum 31 characters" @@ -10919,11 +10913,9 @@ msgid "(UTC-01:00) Azores" msgstr "(UTC-01:00) Azorit" #: dlls/tzres/tzres.rc:264 -#, fuzzy -#| msgid "North Asia East Standard Time" msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" -msgstr "Itäisen Pohjois-Aasian normaaliaika" +msgstr "It. Pohjois-Aasian normaaliaika" #: dlls/tzres/tzres.rc:265 msgctxt "maximum 31 characters" @@ -10958,18 +10950,14 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Buenos Aires" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turks And Caicos Standard Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" -msgstr "Turks- ja Caicossaarten normaaliaika" +msgstr "Turks ja Caicos, normaaliaika" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turks And Caicos Daylight Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" -msgstr "Turks- ja Caicossaarten kesäaika" +msgstr "Turks ja Caicos, kesäaika" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" @@ -11209,11 +11197,9 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 -#, fuzzy -#| msgid "N. Central Asia Standard Time" msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" -msgstr "Pohjoisen Keski-Aasian normaaliaika" +msgstr "Pohj. Keski-Aasian normaaliaika" #: dlls/tzres/tzres.rc:247 msgctxt "maximum 31 characters" @@ -11402,11 +11388,9 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) Koordinoitu yleisaika -02" #: dlls/tzres/tzres.rc:387 -#, fuzzy -#| msgid "US Mountain Standard Time" msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" -msgstr "Kalliovuorten normaaliaika (USA)" +msgstr "Kalliovuorten norm.aika (USA)" #: dlls/tzres/tzres.rc:388 msgctxt "maximum 31 characters" @@ -11497,16 +11481,14 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Jakutsk" #: dlls/tzres/tzres.rc:309 -#, fuzzy -#| msgid "SA Eastern Standard Time" msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" -msgstr "Etelä-Amerikan itäinen normaaliaika" +msgstr "Etelä-Am. itäinen vyöhyke" #: dlls/tzres/tzres.rc:310 msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" -msgstr "Etelä-Amerikan itäinen kesäaika" +msgstr "Etelä-Am. itäinen kesäaika" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" @@ -11552,7 +11534,7 @@ msgstr "Tocantinsin kesäaika" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "(UTC-03:00) Araguaina" +msgstr "(UTC-03:00) Araguaína" #: dlls/tzres/tzres.rc:306 msgctxt "maximum 31 characters" @@ -11569,11 +11551,9 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moskova, Pietari" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Aus Central W. Standard Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" -msgstr "Australian keskilännen normaaliaika" +msgstr "Australian keskilännen vyöhyke" #: dlls/tzres/tzres.rc:64 msgctxt "maximum 31 characters" @@ -11596,7 +11576,7 @@ msgstr "Romaaninen kesäaika" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "(UTC+01:00) Brysseli, Kööpenhamina, Madrid, Pariisi" +msgstr "(UTC+01:00) Bryssel, Kööpenhamina, Madrid, Pariisi" #: dlls/tzres/tzres.rc:159 msgctxt "maximum 31 characters" @@ -11624,12 +11604,12 @@ msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamtšatski" #: dlls/tzres/tzres.rc:435 msgctxt "maximum 31 characters" msgid "West Bank Standard Time" -msgstr "Länsirannikon normaaliaika" +msgstr "Länsirannan ja Gazan norm.ika" #: dlls/tzres/tzres.rc:436 msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" -msgstr "Länsirannikon kesäaika" +msgstr "Länsirannan ja Gazan kesäaika" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" @@ -11650,11 +11630,9 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Damaskos" #: dlls/tzres/tzres.rc:60 -#, fuzzy -#| msgid "AUS Central Standard Time" msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" -msgstr "Australian keskinen normaaliaika" +msgstr "Australian keskinen norm.aika" #: dlls/tzres/tzres.rc:61 msgctxt "maximum 31 characters" @@ -11710,12 +11688,12 @@ msgstr "(UTC+11:00) Norfolkinsaari" #: dlls/tzres/tzres.rc:195 msgctxt "maximum 31 characters" msgid "Israel Standard Time" -msgstr "Israelin normaaliaika" +msgstr "Jerusalemin normaaliaika" #: dlls/tzres/tzres.rc:196 msgctxt "maximum 31 characters" msgid "Israel Daylight Time" -msgstr "Israelin kesäaika" +msgstr "Jerusalemin kesäaika" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" @@ -11736,18 +11714,14 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 -#, fuzzy -#| msgid "SA Pacific Standard Time" msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" -msgstr "Etelä-Amerikan Tyynenmeren normaaliaika" +msgstr "Etelä-Am. Tyynenmeren norm.aika" #: dlls/tzres/tzres.rc:313 -#, fuzzy -#| msgid "SA Pacific Daylight Time" msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" -msgstr "Etelä-Amerikan Tyynenmeren kesäaika" +msgstr "Etelä-Am. Tyynenmeren kesäaika" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" @@ -11793,7 +11767,7 @@ msgstr "Paraguayn kesäaika" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "(UTC-04:00) Asuncion" +msgstr "(UTC-04:00) Asunción" #: dlls/tzres/tzres.rc:132 msgctxt "maximum 31 characters" @@ -11992,18 +11966,14 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 -#, fuzzy -#| msgid "SA Western Standard Time" msgctxt "maximum 31 characters" msgid "SA Western Standard Time" -msgstr "Etelä-Amerikan läntinen normaaliaika" +msgstr "Etelä-Am. läntinen normaaliaika" #: dlls/tzres/tzres.rc:316 -#, fuzzy -#| msgid "SA Western Daylight Time" msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" -msgstr "Etelä-Amerikan läntinen kesäaika" +msgstr "Etelä-Am. läntinen kesäaika" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" @@ -12173,16 +12143,14 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) Helsinki, Kiova, Riika, Sofia, Tallinna, Vilna" #: dlls/tzres/tzres.rc:144 -#, fuzzy -#| msgid "E. South America Standard Time" msgctxt "maximum 31 characters" msgid "E. South America Standard Time" -msgstr "Itäisen Etelä-Amerikan normaaliaika" +msgstr "Itäisen Etelä-Am. vyöhyke" #: dlls/tzres/tzres.rc:145 msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" -msgstr "Itäisen Etelä-Amerikan kesäaika" +msgstr "Itäisen Etelä-Am. kesäaika" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" @@ -12203,11 +12171,9 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) Salomonsaaret, Uusi-Kaledonia" #: dlls/tzres/tzres.rc:423 -#, fuzzy -#| msgid "W. Central Africa Standard Time" msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" -msgstr "Läntisen Keski-Afrikan normaaliaika" +msgstr "Läntis. Keski-Afrikan norm.aika" #: dlls/tzres/tzres.rc:424 msgctxt "maximum 31 characters" @@ -12216,21 +12182,17 @@ msgstr "Läntisen Keski-Afrikan kesäaika" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) West Central Africa" -msgstr "(UTC+01:00) Länsi-Afrikan aika" +msgstr "(UTC+01:00) Läntinen Keski-Afrikka" #: dlls/tzres/tzres.rc:276 -#, fuzzy -#| msgid "Pacific SA Standard Time" msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" -msgstr "Tyynenmeren Etelä-Amerikan normaaliaika" +msgstr "Tyynenmeren Etelä-Am. norm.aika" #: dlls/tzres/tzres.rc:277 -#, fuzzy -#| msgid "Pacific SA Daylight Time" msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" -msgstr "Tyynenmeren Etelä-Amerikan kesäaika" +msgstr "Tyynenmeren Etelä-Am. kesäaika" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -- 2.35.1

1 0

[PATCH 7/7] winealsa: Move MODM_RESET to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 41 ++++++++++++++++++++++++++++++++++-- dlls/winealsa.drv/midi.c | 36 ------------------------------- dlls/winealsa.drv/unixlib.h | 15 ++----------- 3 files changed, 41 insertions(+), 51 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index f3de2a5ce07..b99c3aedd33 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -48,6 +48,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); +struct midi_dest +{ + BOOL bEnabled; + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIOUTCAPSW caps; + snd_seq_t *seq; + snd_seq_addr_t addr; + int port_out; +}; + static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; static unsigned int num_dests, num_srcs; @@ -353,9 +364,7 @@ NTSTATUS midi_init(void *args) free( pinfo ); *params->err = NOERROR; - params->num_dests = num_dests; params->num_srcs = num_srcs; - params->dests = dests; params->srcs = srcs; TRACE("End\n"); @@ -800,6 +809,31 @@ static UINT midi_out_get_volume(WORD dev_id, UINT* volume) return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; } +static UINT midi_out_reset(WORD dev_id) +{ + unsigned chn; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + if (!dests[dev_id].bEnabled) return MIDIERR_NODEVICE; + + /* stop all notes */ + /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that + * it's channel dependent... + */ + for (chn = 0; chn < 16; chn++) + { + /* turn off every note */ + midi_out_data(dev_id, 0x7800 | MIDI_CMD_CONTROL | chn); + /* remove sustain on all channels */ + midi_out_data(dev_id, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn); + } + /* FIXME: the LongData buffers must also be returned to the app */ + return MMSYSERR_NOERROR; +} + + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -844,6 +878,9 @@ NTSTATUS midi_out_message(void *args) case MODM_SETVOLUME: *params->err = 0; break; + case MODM_RESET: + *params->err = midi_out_reset(params->dev_id); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 0ed2feb41eb..53b683f59c8 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -48,10 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); static WINE_MIDIIN *MidiInDev; -static WINE_MIDIOUT *MidiOutDev; -/* this is the total number of MIDI out devices found (synth and port) */ -static int MODM_NumDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; @@ -605,35 +602,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/************************************************************************** - * modReset [internal] - */ -static DWORD modReset(WORD wDevID) -{ - DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2); - unsigned chn; - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - /* stop all notes */ - /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that - * it's channel dependent... - */ - for (chn = 0; chn < 16; chn++) { - /* turn off every note */ - ALSA_modMessage(wDevID, MODM_DATA, 0, 0x7800 | MIDI_CMD_CONTROL | chn, 0); - /* remove sustain on all channels */ - ALSA_modMessage(wDevID, MODM_DATA, 0, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn, 0); - } - /* FIXME: the LongData buffers must also be returned to the app */ - return MMSYSERR_NOERROR; -} - - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -653,9 +621,7 @@ static BOOL ALSA_MidiInit(void) if (!err) { - MODM_NumDevs = params.num_dests; MIDM_NumDevs = params.num_srcs; - MidiOutDev = params.dests; MidiInDev = params.srcs; } return TRUE; @@ -721,8 +687,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_RESET: - return modReset(wDevID); } params.dev_id = wDevID; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e3cd7123101..c1dbd83b84e 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -223,22 +223,11 @@ typedef struct midi_src int port_in; } WINE_MIDIIN; -typedef struct midi_dest -{ - BOOL bEnabled; - MIDIOPENDESC midiDesc; - WORD wFlags; - MIDIOUTCAPSW caps; - snd_seq_t *seq; - snd_seq_addr_t addr; - int port_out; -} WINE_MIDIOUT; - struct midi_init_params { UINT *err; - unsigned int num_dests, num_srcs; - void *dests, *srcs; + unsigned int num_srcs; + void *srcs; }; struct notify_context -- 2.25.1

2 1

[PATCH 6/7] winealsa: Move MODM_GETVOLUME and MODM_SETVOLUME to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 15 +++++++++++++++ dlls/winealsa.drv/midi.c | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index fa09626bc80..f3de2a5ce07 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -791,6 +791,15 @@ static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_out_get_volume(WORD dev_id, UINT* volume) +{ + if (!volume) return MMSYSERR_INVALPARAM; + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + + *volume = 0xFFFFFFFF; + return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -829,6 +838,12 @@ NTSTATUS midi_out_message(void *args) case MODM_GETNUMDEVS: *params->err = num_dests; break; + case MODM_GETVOLUME: + *params->err = midi_out_get_volume(params->dev_id, (UINT *)params->param_1); + break; + case MODM_SETVOLUME: + *params->err = 0; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4b8062390fa..0ed2feb41eb 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -605,17 +605,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/************************************************************************** - * modGetVolume [internal] - */ -static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume) -{ - if (!lpdwVolume) return MMSYSERR_INVALPARAM; - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - *lpdwVolume = 0xFFFFFFFF; - return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; -} - /************************************************************************** * modReset [internal] */ @@ -732,10 +721,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_GETVOLUME: - return modGetVolume(wDevID, (DWORD*)dwParam1); - case MODM_SETVOLUME: - return 0; case MODM_RESET: return modReset(wDevID); } -- 2.25.1

2 1

[PATCH 5/7] winealsa: Move MODM_GETNUMDEVS to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 3 +++ dlls/winealsa.drv/midi.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 602682554c0..fa09626bc80 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -826,6 +826,9 @@ NTSTATUS midi_out_message(void *args) case MODM_GETDEVCAPS: *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); break; + case MODM_GETNUMDEVS: + *params->err = num_dests; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index b9b3bbf7c35..4b8062390fa 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -732,8 +732,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_GETNUMDEVS: - return MODM_NumDevs; case MODM_GETVOLUME: return modGetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME: -- 2.25.1

2 1

[PATCH 4/7] winealsa: Move MODM_GETDEVAPS to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 15 +++++++++++++++ dlls/winealsa.drv/midi.c | 17 ----------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index bc68442a0d7..602682554c0 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -779,6 +779,18 @@ static UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) return MMSYSERR_NOERROR; } +static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size) +{ + TRACE("(%04X, %p, %08X);\n", dev_id, caps, size); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + if (!caps) return MMSYSERR_INVALPARAM; + + memcpy(caps, &dests[dev_id].caps, min(size, sizeof(*caps))); + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -811,6 +823,9 @@ NTSTATUS midi_out_message(void *args) case MODM_UNPREPARE: *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; + case MODM_GETDEVCAPS: + *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 7329b2cd2e7..b9b3bbf7c35 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -605,21 +605,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/************************************************************************** - * modGetDevCaps [internal] - */ -static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) -{ - TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - - memcpy(lpCaps, &MidiOutDev[wDevID].caps, min(dwSize, sizeof(*lpCaps))); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * modGetVolume [internal] */ @@ -747,8 +732,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_GETDEVCAPS: - return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2); case MODM_GETNUMDEVS: return MODM_NumDevs; case MODM_GETVOLUME: -- 2.25.1

2 1

[PATCH 3/7] winealsa: Move MODM_PREPARE and MODM_UNPREPARE to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 36 +++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 39 ------------------------------------ 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 0a3e1a80be3..bc68442a0d7 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -749,6 +749,36 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct return MMSYSERR_NOERROR; } +static UINT midi_out_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + return MMSYSERR_NOERROR; +} + +static UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -775,6 +805,12 @@ NTSTATUS midi_out_message(void *args) case MODM_LONGDATA: *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); break; + case MODM_PREPARE: + *params->err = midi_out_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; + case MODM_UNPREPARE: + *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 5638dace27c..7329b2cd2e7 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -620,41 +620,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modPrepare [internal] - */ -static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_PREPARED) - return MMSYSERR_NOERROR; - - lpMidiHdr->lpNext = 0; - lpMidiHdr->dwFlags |= MHDR_PREPARED; - lpMidiHdr->dwFlags &= ~(MHDR_DONE|MHDR_INQUEUE); /* flags cleared since w2k */ - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * modUnprepare [internal] - */ -static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MMSYSERR_NOERROR; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_PREPARED; - return MMSYSERR_NOERROR; -} - /************************************************************************** * modGetVolume [internal] */ @@ -782,10 +747,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_PREPARE: - return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MODM_UNPREPARE: - return modUnprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_GETDEVCAPS: return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2); case MODM_GETNUMDEVS: -- 2.25.1

2 1

[PATCH 2/7] winealsa: Move MODM_LONGDATA to the unixlib.
by Huw Davies 17 Mar '22

17 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 101 +++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 106 ----------------------------------- 2 files changed, 101 insertions(+), 106 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 32c983ba0a3..0a3e1a80be3 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -651,6 +651,104 @@ static UINT midi_out_data(WORD dev_id, UINT data) return MMSYSERR_NOERROR; } +static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct notify_context *notify) +{ + struct midi_dest *dest; + int len_add = 0; + BYTE *data, *new_data = NULL; + snd_seq_event_t event; + + TRACE("(%04X, %p, %08X);\n", dev_id, hdr, hdr_size); + + /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure + * but it seems to be used only for midi input. + * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. + */ + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + dest = dests + dev_id; + + if (!dest->bEnabled) return MIDIERR_NODEVICE; + + if (dest->seq == NULL) + { + WARN("can't play !\n"); + return MIDIERR_NODEVICE; + } + + data = (BYTE*)hdr->lpData; + + if (data == NULL) + return MIDIERR_UNPREPARED; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + hdr->dwFlags &= ~MHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + + /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive + * data, or can it also contain raw MIDI data, to be split up and sent to + * modShortData() ? + * If the latest is true, then the following WARNing will fire up + */ + if (data[0] != 0xF0 || data[hdr->dwBufferLength - 1] != 0xF7) + { + WARN("Alleged system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); + new_data = malloc(hdr->dwBufferLength + 2); + } + + TRACE("dwBufferLength=%u !\n", hdr->dwBufferLength); + TRACE(" %02X %02X %02X ... %02X %02X %02X\n", + data[0], data[1], data[2], data[hdr->dwBufferLength-3], + data[hdr->dwBufferLength-2], data[hdr->dwBufferLength-1]); + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + /* FIXME: I don't think there is much to do here */ + free(new_data); + break; + case MOD_MIDIPORT: + if (data[0] != 0xF0) + { + /* Send start of System Exclusive */ + len_add = 1; + new_data[0] = 0xF0; + memcpy(new_data + 1, data, hdr->dwBufferLength); + WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n"); + } + if (data[hdr->dwBufferLength-1] != 0xF7) + { + /* Send end of System Exclusive */ + if (!len_add) + memcpy(new_data, data, hdr->dwBufferLength); + new_data[hdr->dwBufferLength + len_add] = 0xF7; + len_add++; + WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n"); + } + snd_seq_ev_clear(&event); + snd_seq_ev_set_direct(&event); + snd_seq_ev_set_source(&event, dest->port_out); + snd_seq_ev_set_subs(&event); + snd_seq_ev_set_sysex(&event, hdr->dwBufferLength + len_add, new_data ? new_data : data); + seq_lock(); + snd_seq_event_output_direct(dest->seq, &event); + seq_unlock(); + free(new_data); + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + free(new_data); + return MMSYSERR_NOTENABLED; + } + + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_out_notify(notify, dest, dev_id, MOM_DONE, (DWORD_PTR)hdr, 0); + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -674,6 +772,9 @@ NTSTATUS midi_out_message(void *args) case MODM_DATA: *params->err = midi_out_data(params->dev_id, params->param_1); break; + case MODM_LONGDATA: + *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index dd2f3cd9040..5638dace27c 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -122,16 +122,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_DONE: - case MOM_POSITIONCB: - if (wDevID > MODM_NumDevs) return; - - dwCallBack = MidiOutDev[wDevID].midiDesc.dwCallback; - uFlags = MidiOutDev[wDevID].wFlags; - hDev = MidiOutDev[wDevID].midiDesc.hMidi; - dwInstance = MidiOutDev[wDevID].midiDesc.dwInstance; - break; - case MIM_OPEN: case MIM_CLOSE: case MIM_DATA: @@ -630,100 +620,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modLongData [internal] - */ -static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - int len_add = 0; - BYTE *lpData, *lpNewData = NULL; - snd_seq_event_t event; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize); - - /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure - * but it seems to be used only for midi input. - * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. - */ - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - if (MidiOutDev[wDevID].seq == NULL) { - WARN("can't play !\n"); - return MIDIERR_NODEVICE; - } - - lpData = (BYTE*)lpMidiHdr->lpData; - - if (lpData == NULL) - return MIDIERR_UNPREPARED; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MIDIERR_UNPREPARED; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - - /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive - * data, or can it also contain raw MIDI data, to be split up and sent to - * modShortData() ? - * If the latest is true, then the following WARNing will fire up - */ - if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { - WARN("Alleged system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); - lpNewData = HeapAlloc(GetProcessHeap(), 0, lpMidiHdr->dwBufferLength + 2); - } - - TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength); - TRACE(" %02X %02X %02X ... %02X %02X %02X\n", - lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3], - lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]); - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - /* FIXME: I don't think there is much to do here */ - HeapFree(GetProcessHeap(), 0, lpNewData); - break; - case MOD_MIDIPORT: - if (lpData[0] != 0xF0) { - /* Send start of System Exclusive */ - len_add = 1; - lpNewData[0] = 0xF0; - memcpy(lpNewData + 1, lpData, lpMidiHdr->dwBufferLength); - WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n"); - } - if (lpData[lpMidiHdr->dwBufferLength-1] != 0xF7) { - /* Send end of System Exclusive */ - if (!len_add) - memcpy(lpNewData, lpData, lpMidiHdr->dwBufferLength); - lpNewData[lpMidiHdr->dwBufferLength + len_add] = 0xF7; - len_add++; - WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n"); - } - snd_seq_ev_clear(&event); - snd_seq_ev_set_direct(&event); - snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out); - snd_seq_ev_set_subs(&event); - snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); - seq_lock(); - snd_seq_event_output_direct(MidiOutDev[wDevID].seq, &event); - seq_unlock(); - HeapFree(GetProcessHeap(), 0, lpNewData); - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - HeapFree(GetProcessHeap(), 0, lpNewData); - return MMSYSERR_NOTENABLED; - } - - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); - return MMSYSERR_NOERROR; -} - /************************************************************************** * modPrepare [internal] */ @@ -886,8 +782,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_LONGDATA: - return modLongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_UNPREPARE: -- 2.25.1

2 1