wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Vitaliy Margolen : dinput: Fix device enumeration by DX8 device type.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 7260132c5d8aa0aa753c12d1e7420c307e651359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7260132c5d8aa0aa753c12d1e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Dec 1 21:08:14 2011 -0700 dinput: Fix device enumeration by DX8 device type. --- dlls/dinput/dinput_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e69bbf0..6350a18 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -359,7 +359,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( if (!lpCallback || dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) || - dwDevType > 4) + (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL) return DIERR_INVALIDPARAM; if (!This->initialized) @@ -398,7 +398,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( if (!lpCallback || dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) || - dwDevType > 4) + (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL) return DIERR_INVALIDPARAM; if (!This->initialized)

1 0

André Hentschel : winebuild: Fill the delay slot on Sparc.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: c50f25e91b04bd2c0bb971540d1af54969f7253c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50f25e91b04bd2c0bb971540… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 1 23:56:00 2011 +0100 winebuild: Fill the delay slot on Sparc. --- tools/winebuild/import.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 00c030b..af02a9d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1071,6 +1071,7 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) case CPU_SPARC: output( "\tset %d, %%g1\n", (idx << 16) | j ); output( "\tb,a %s\n", asm_name("__wine_delay_load_asm") ); + output( "\tnop\n" ); break; case CPU_ARM: output( "\tstmfd SP!, {r0-r3}\n" );

1 0

Francois Gouget : cmd: Print error messages on stderr, not on stdout.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: bc176ecb8140f319355874790ea307e9156ab8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc176ecb8140f319355874790… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 10:07:27 2011 +0100 cmd: Print error messages on stderr, not on stdout. --- programs/cmd/builtins.c | 20 ++++++++++---------- programs/cmd/tests/test_builtins.cmd | 1 - programs/cmd/tests/test_builtins.cmd.exp | 7 +++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 60f9f99..216a28b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -194,7 +194,7 @@ void WCMD_clear_screen (void) { void WCMD_change_tty (void) { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } @@ -390,7 +390,7 @@ void WCMD_copy (void) { WCHAR ext[MAX_PATH]; if (param1[0] == 0x00) { - WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NOARG)); return; } @@ -1135,7 +1135,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Ensure line continues with variable */ if (!*curPos || *curPos != '%') { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -1154,7 +1154,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (!*curPos || !WCMD_keyword_ws_found(inW, sizeof(inW)/sizeof(inW[0]), curPos)) { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -1181,7 +1181,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if ((*cmdList == NULL) || !WCMD_keyword_ws_found(doW, sizeof(doW)/sizeof(doW[0]), (*cmdList)->command)) { - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -2199,14 +2199,14 @@ void WCMD_setshow_date (void) { WCMD_output (WCMD_LoadMessage(WCMD_NEWDATE)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); if (count > 2) { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } } else WCMD_print_error (); } else { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } @@ -2427,14 +2427,14 @@ void WCMD_setshow_time (void) { WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); if (count > 2) { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } } else WCMD_print_error (); } else { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); + WCMD_output_stderr (WCMD_LoadMessage(WCMD_NYI)); } } @@ -2515,7 +2515,7 @@ void WCMD_type (WCHAR *command) { FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { WCMD_print_error (); - WCMD_output(WCMD_LoadMessage(WCMD_READFAIL), thisArg); /* should be _stderr */ + WCMD_output_stderr(WCMD_LoadMessage(WCMD_READFAIL), thisArg); errorlevel = 1; } else { if (writeHeaders) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f03a05e..6295f9e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -141,7 +141,6 @@ if 1==1 (echo foo2>bar) else echo baz2>bar type bar & del bar if 1==1 (echo foo3) else echo baz3>bar type bar || echo file does not exist, ok -echo ----- if 1==1 (echo foo4>bar) else echo baz4>bar type bar & del bar if 1==0 (echo foo5>bar) else echo baz5>bar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a005fc2..7537ebc 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -166,8 +166,7 @@ food21 ----- foo2 foo3 -@todo_wine@file does not exist, ok -@todo_wine@----- +file does not exist, ok foo4 baz5 baz6@space@ @@ -190,8 +189,8 @@ baz @todo_wine@foo | echo bar @todo_wine@foo & echo bar @todo_wine@bak & -@todo_wine@baz@space@ -@todo_wine@0@or_broken@1 +baz@space@ +0@or_broken@1 @todo_wine@foo > foo @todo_wine@< @todo_wine@ffoof

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 4b798098444a4a1d175b55f0388774f8c32c4a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b798098444a4a1d175b55f03… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 2 00:36:22 2011 -0700 po: Update Catalan translation. --- po/ca.po | 162 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 63 insertions(+), 99 deletions(-) diff --git a/po/ca.po b/po/ca.po index bea8ff4..317ccdb 100644 --- a/po/ca.po +++ b/po/ca.po @@ -112,7 +112,6 @@ msgid "Wine Gecko Installer" msgstr "Instal·lador del Wine Gecko" #: appwiz.rc:100 -#, fuzzy msgid "" "Wine could not find a Gecko package which is needed for applications " "embedding HTML to work correctly. Wine can automatically download and " @@ -127,7 +126,8 @@ msgstr "" "descarregar i instal·lar automàticament per vostè.\n" "\n" "Nota: es recomana utilitzar els paquets de la vostra distribució en compte." -"Vegeu http://wiki.winehq.org/Gecko pels detalls." +"Vegeu <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko" +"</a> pels detalls." #: appwiz.rc:106 msgid "&Install" @@ -222,7 +222,7 @@ msgstr "" #: avifil32.rc:39 msgid "Compress options" -msgstr "Opcions d'compressió" +msgstr "Opcions de compressió" #: avifil32.rc:42 msgid "&Choose a stream:" @@ -1036,7 +1036,7 @@ msgstr "Restriccions de Nom" #: crypt32.rc:97 msgid "Policy Mappings" -msgstr "Mappings de Política" +msgstr "Mapes de Política" #: crypt32.rc:98 msgid "Policy Constraints" @@ -1052,7 +1052,7 @@ msgstr "Polítiques d'Aplicació" #: crypt32.rc:101 msgid "Application Policy Mappings" -msgstr "Mappings de Política d'Aplicació" +msgstr "Mapes de Política d'Aplicació" #: crypt32.rc:102 msgid "Application Policy Constraints" @@ -2191,38 +2191,32 @@ msgid "Default MidiOut Device" msgstr "Dispositiu MidiOut Predeterminat" #: dinput.rc:40 -#, fuzzy msgid "Configure Devices" -msgstr "&Defineix..." +msgstr "Configurar Dispositius" #: dinput.rc:45 msgid "Reset" -msgstr "" +msgstr "Reinicia" #: dinput.rc:48 -#, fuzzy msgid "Player" -msgstr "Reprodueix" +msgstr "Reproductor" #: dinput.rc:49 -#, fuzzy msgid "Device" -msgstr "Dispositi&u:" +msgstr "Dispositiu" #: dinput.rc:50 -#, fuzzy msgid "Actions" -msgstr "Acció" +msgstr "Accions" #: dinput.rc:51 -#, fuzzy msgid "Mapping" -msgstr "Mapa d'Unitat" +msgstr "Mapa" #: dinput.rc:53 -#, fuzzy msgid "Sort Assigned" -msgstr "Ja assignat\n" +msgstr "Ordena Assignats" #: dinput.rc:34 msgid "Action" @@ -4171,11 +4165,11 @@ msgstr "Cap xarxa\n" #: winerror.mc:1746 msgid "Operation canceled by user\n" -msgstr "Operació cancel·lat per l'usuari\n" +msgstr "Operació cancel·lat per usuari\n" #: winerror.mc:1751 msgid "File has a user-mapped section\n" -msgstr "El fitxer té una secció assignada per l'usuari\n" +msgstr "El fitxer té una secció assignada per usuari\n" #: winerror.mc:1756 winerror.mc:3741 msgid "Connection refused\n" @@ -5858,14 +5852,12 @@ msgid "&Attributes:" msgstr "&Atributs:" #: mshtml.rc:37 -#, fuzzy msgid "Hyperlink" -msgstr "enllaç" +msgstr "Hiperenllaç" #: mshtml.rc:40 -#, fuzzy msgid "Hyperlink Information" -msgstr "Informació de Versió" +msgstr "Informació de Hiperenllaç" #: mshtml.rc:41 winecfg.rc:247 msgid "&Type:" @@ -6002,42 +5994,36 @@ msgstr "" "© 2002 per Michael Guennewig" #: msvfw32.rc:30 -#, fuzzy msgid "Video Compression" -msgstr "Opcions d'compressió" +msgstr "Compressió de Video" #: msvfw32.rc:36 -#, fuzzy msgid "&Compressor:" -msgstr "&Comprimit" +msgstr "" #: msvfw32.rc:39 -#, fuzzy msgid "Con&figure..." -msgstr "&Defineix..." +msgstr "Con&figura..." #: msvfw32.rc:40 -#, fuzzy msgid "&About" -msgstr "Quant a..." +msgstr "&Quant a" #: msvfw32.rc:44 msgid "Compression &Quality:" -msgstr "" +msgstr "&Qualitat de Compressió:" #: msvfw32.rc:46 -#, fuzzy msgid "&Key Frame Every" -msgstr "Recuperació de Clau" +msgstr "" #: msvfw32.rc:50 -#, fuzzy msgid "&Data Rate" -msgstr "&Data" +msgstr "Velocitat de &Dades" #: msvfw32.rc:52 msgid "kB/sec" -msgstr "" +msgstr "kB/seg" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -6324,61 +6310,52 @@ msgid "Off" msgstr "Inactiu" #: oledlg.rc:48 -#, fuzzy msgid "Insert Object" -msgstr "Objectes GDI" +msgstr "Insereix Objecte" #: oledlg.rc:54 -#, fuzzy msgid "Object Type:" -msgstr "Tipus d'Entitat" +msgstr "Tipus d'Objecte" #: oledlg.rc:57 oledlg.rc:95 msgid "Result" -msgstr "" +msgstr "Resultat" #: oledlg.rc:58 -#, fuzzy msgid "Create New" -msgstr "Crea Tasca Nova" +msgstr "Crea Nova" #: oledlg.rc:60 -#, fuzzy msgid "Create Control" -msgstr "Control" +msgstr "Crea Control" #: oledlg.rc:62 -#, fuzzy msgid "Create From File" -msgstr "Crear Nova Carpeta" +msgstr "Crea des d'un Fitxer" #: oledlg.rc:65 -#, fuzzy msgid "&Add Control..." -msgstr "Afegeix Control" +msgstr "&Afegeix Control..." #: oledlg.rc:66 msgid "Display As Icon" -msgstr "" +msgstr "Mostra com Icona" #: oledlg.rc:68 setupapi.rc:58 -#, fuzzy msgid "Browse..." -msgstr "&Navega..." +msgstr "Navega..." #: oledlg.rc:69 -#, fuzzy msgid "File:" -msgstr "Fitxer" +msgstr "Fitxer:" #: oledlg.rc:75 msgid "Paste Special" -msgstr "" +msgstr "Enganxa Especial" #: oledlg.rc:78 setupapi.rc:40 -#, fuzzy msgid "Source:" -msgstr "&Veure Font" +msgstr "Font:" #: oledlg.rc:79 shdoclc.rc:47 shdoclc.rc:79 shdoclc.rc:92 shdoclc.rc:132 #: shdoclc.rc:159 shdoclc.rc:183 user32.rc:59 wineconsole.rc:30 wordpad.rc:103 @@ -6386,22 +6363,20 @@ msgid "&Paste" msgstr "&Enganxar" #: oledlg.rc:81 -#, fuzzy msgid "Paste &Link" -msgstr "Enganxa com Enllaç" +msgstr "Enganxa &Enllaç" #: oledlg.rc:83 msgid "&As:" -msgstr "" +msgstr "&Com:" #: oledlg.rc:90 msgid "&Display As Icon" -msgstr "" +msgstr "&Mostra Com Icona" #: oledlg.rc:92 -#, fuzzy msgid "Change &Icon..." -msgstr "Canvia d'&icona..." +msgstr "Canvia d'&Icona..." #: oledlg.rc:25 msgid "Insert a new %s object into your document" @@ -6531,57 +6506,53 @@ msgid "us" msgstr "µs" #: serialui.rc:25 -#, fuzzy msgid "Settings for %s" -msgstr "Propietats de %s" +msgstr "Ajustaments de %s" #: serialui.rc:28 msgid "Baud Rate" -msgstr "" +msgstr "Velocitat en Baud" #: serialui.rc:30 msgid "Parity" -msgstr "" +msgstr "Paritat" #: serialui.rc:32 -#, fuzzy msgid "Flow Control" -msgstr "Control" +msgstr "Control de Flux" #: serialui.rc:34 -#, fuzzy msgid "Data Bits" -msgstr "Dades" +msgstr "Bits de Dades" #: serialui.rc:36 -#, fuzzy msgid "Stop Bits" -msgstr "Atura" +msgstr "Bits de Terminació" #: setupapi.rc:36 msgid "Copying Files..." -msgstr "" +msgstr "Copiant Fitxers..." #: setupapi.rc:42 -#, fuzzy msgid "Destination:" -msgstr "&Descripció:" +msgstr "Destinació:" #: setupapi.rc:49 -#, fuzzy msgid "Files Needed" -msgstr "Nom de &Fitxer:" +msgstr "Calen Fitxers" #: setupapi.rc:52 msgid "" "Insert the manufacturer's installation disk, and then\n" "make sure the correct drive is selected below" msgstr "" +"Inseriu el disc d'instal·lació del fabricant, i\n" +"llavors assegureu-vos que la unitat correcta estigui\n" +"seleccionada abaix" #: setupapi.rc:54 -#, fuzzy msgid "Copy manufacturer's files from:" -msgstr "Copia fitxers de:" +msgstr "Copiar fitxers del fabricant de:" #: setupapi.rc:28 msgid "The file '%1' on %2 is needed" @@ -7532,39 +7503,32 @@ msgid "Duplex:" msgstr "Dúplex" #: wininet.rc:39 wininet.rc:59 -#, fuzzy msgid "Realm" -msgstr "Temps &real" +msgstr "Regne" #: wininet.rc:46 wininet.rc:66 -#, fuzzy msgid "&Save this password (insecure)" -msgstr "&Desa aquesta contrasenya (No segur)" +msgstr "&Desa aquesta contrasenya (no segur)" #: wininet.rc:54 -#, fuzzy msgid "Authentication Required" -msgstr "Autenticació Forta Requerida" +msgstr "Autenticació Requerida" #: wininet.rc:58 -#, fuzzy msgid "Server" -msgstr "Servidor Fora de Línia" +msgstr "Servidor" #: wininet.rc:74 -#, fuzzy msgid "Security Warning" -msgstr "Seguritat" +msgstr "Advertència de Seguritat" #: wininet.rc:77 -#, fuzzy msgid "There is a problem with the certificate for this site." -msgstr "El nom en el certificat no coincideix amb el lloc." +msgstr "Hi ha un problema amb el certificat d'aquest lloc." #: wininet.rc:79 -#, fuzzy msgid "Do you want to continue anyway?" -msgstr "Voleu simular un reinici de Windows?" +msgstr "Voleu continuar igualment?" #: wininet.rc:25 msgid "LAN Connection" @@ -9045,8 +9009,8 @@ msgid "" "presses an allowed Key from a selectable list.\n" "CHOICE is mainly used to build a menu selection in a batch file.\n" msgstr "" -"CHOICE mostra un text i espera fins que l'Usuari\n" -"premi una Tecla permesa d'una llista seleccionable.\n" +"CHOICE mostra un text i espera fins que l'Usuari premi una Tecla permesa\n" +"d'una llista seleccionable.\n" "CHOISE s'usa principalment per construir un menú de selecció en un fitxer\n" "batch.\n" @@ -12224,7 +12188,7 @@ msgstr "" #: winecfg.rc:80 msgctxt "Drive letter" msgid "Letter" -msgstr "Lletra d'Unitat" +msgstr "Lletra" #: winecfg.rc:81 msgid "Drive Mapping"

1 0

Nikolay Sivov : po: Updated Russian translation.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 120ff842cc1234dca42cfa9de920175ab791b8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120ff842cc1234dca42cfa9de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 2 09:56:24 2011 +0300 po: Updated Russian translation. --- po/ru.po | 190 ++++++++++++++++++++++---------------------------------------- 1 files changed, 68 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=120ff842cc1234dca42cf…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DRASTER_STATUS typedef.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 360c1114d6bd829d786a6a8548a0a7a9725e3ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=360c1114d6bd829d786a6a854… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 2 08:15:53 2011 +0100 wined3d: Get rid of the WINED3DRASTER_STATUS typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 3 ++- dlls/d3d9/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d.h | 12 ++++++------ 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 88a5c4b..923046d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -648,7 +648,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRasterStatus(IDirect3DDevice8 *ifa TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_raster_status(This->wined3d_device, 0, (WINED3DRASTER_STATUS *)pRasterStatus); + hr = wined3d_device_get_raster_status(This->wined3d_device, 0, (struct wined3d_raster_status *)pRasterStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f4686e3..684ae4d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -640,7 +640,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRasterStatus(IDirect3DDevice9Ex *i TRACE("iface %p, swapchain %u, raster_status %p.\n", iface, iSwapChain, pRasterStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_raster_status(This->wined3d_device, iSwapChain, (WINED3DRASTER_STATUS *)pRasterStatus); + hr = wined3d_device_get_raster_status(This->wined3d_device, + iSwapChain, (struct wined3d_raster_status *)pRasterStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index be0c244..928bb89 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -146,7 +146,7 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetRasterStatus(LPDIRECT3DSWAPCHAI TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus); wined3d_mutex_lock(); - hr = wined3d_swapchain_get_raster_status(This->wined3d_swapchain, (WINED3DRASTER_STATUS *)pRasterStatus); + hr = wined3d_swapchain_get_raster_status(This->wined3d_swapchain, (struct wined3d_raster_status *)pRasterStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 36b1208..1226390 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4572,7 +4572,7 @@ BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_de } HRESULT CDECL wined3d_device_get_raster_status(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status) + UINT swapchain_idx, struct wined3d_raster_status *raster_status) { struct wined3d_swapchain *swapchain; HRESULT hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1ea7858..39886190 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -203,7 +203,7 @@ HRESULT CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain * } HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, - WINED3DRASTER_STATUS *raster_status) + struct wined3d_raster_status *raster_status) { static BOOL warned; /* No OpenGL equivalent */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 34abce9..1a0d170 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1696,11 +1696,11 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DRASTER_STATUS +struct wined3d_raster_status { - BOOL InVBlank; - UINT ScanLine; -} WINED3DRASTER_STATUS; + BOOL in_vblank; + UINT scan_line; +}; typedef struct _WINED3DDEVINFO_VERTEXSTATS { @@ -2177,7 +2177,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status); + UINT swapchain_idx, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, WINED3DRENDERSTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, @@ -2411,7 +2411,7 @@ void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swap HRESULT __cdecl wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, struct wined3d_swapchain_desc *desc); HRESULT __cdecl wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, - WINED3DRASTER_STATUS *raster_status); + struct wined3d_raster_status *raster_status); ULONG __cdecl wined3d_swapchain_incref(struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override,

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DPRESENT_PARAMETERS typedef.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: 94c9b0b4fcad2399289642709aef5f0facee190f URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c9b0b4fcad2399289642709… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 2 08:15:52 2011 +0100 wined3d: Get rid of the WINED3DPRESENT_PARAMETERS typedef. --- dlls/d3d10core/device.c | 6 +- dlls/d3d8/device.c | 154 +++++++++++++++--------------- dlls/d3d8/swapchain.c | 60 ++++++------ dlls/d3d9/device.c | 171 +++++++++++++++++---------------- dlls/d3d9/swapchain.c | 98 ++++++++++--------- dlls/ddraw/ddraw.c | 46 +++++----- dlls/dxgi/device.c | 8 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/factory.c | 41 ++++---- dlls/dxgi/swapchain.c | 4 +- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 207 +++++++++++++++++++++------------------- dlls/wined3d/stateblock.c | 4 +- dlls/wined3d/surface.c | 10 +- dlls/wined3d/swapchain.c | 144 ++++++++++++++-------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 50 +++++----- include/wine/winedxgi.idl | 2 +- 19 files changed, 511 insertions(+), 504 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94c9b0b4fcad239928964…

1 0

Henri Verbeet : d3d9/tests: Add a test for texture creation from system memory.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: a51b03f16e030850f96199898dcff00926c5ff87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51b03f16e030850f96199898… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 2 08:15:51 2011 +0100 d3d9/tests: Add a test for texture creation from system memory. --- dlls/d3d9/tests/d3d9ex.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 0058ead..c2f99b7 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -49,6 +49,42 @@ static HWND create_window(void) return ret; } +static IDirect3DDevice9Ex *create_device(IDirect3D9Ex *d3d9, HWND device_window, HWND focus_window, BOOL windowed) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9Ex *device; + D3DDISPLAYMODEEX mode, *m; + + present_parameters.Windowed = windowed; + present_parameters.hDeviceWindow = device_window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + mode.Size = sizeof(mode); + mode.Width = 640; + mode.Height = 480; + mode.RefreshRate = 0; + mode.Format = D3DFMT_A8R8G8B8; + mode.ScanLineOrdering = 0; + + m = windowed ? NULL : &mode; + if (SUCCEEDED(IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) return device; + + present_parameters.AutoDepthStencilFormat = D3DFMT_D16; + if (SUCCEEDED(IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) return device; + + if (SUCCEEDED(IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, m, &device))) return device; + + return NULL; +} + static ULONG getref(IUnknown *obj) { IUnknown_AddRef(obj); return IUnknown_Release(obj); @@ -340,6 +376,56 @@ out: IDirect3D9Ex_Release(d3d9ex); } +static void test_texture_sysmem_create(void) +{ + IDirect3DDevice9Ex *device; + IDirect3DTexture9 *texture; + D3DLOCKED_RECT locked_rect; + IDirect3D9Ex *d3d9; + UINT refcount; + HWND window; + HRESULT hr; + void *mem; + + if (FAILED(hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9))) + { + skip("Failed to create IDirect3D9Ex object (hr %#x), skipping tests.\n", hr); + return; + } + + window = create_window(); + device = create_device(d3d9, window, window, TRUE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 128 * 128 * 4); + hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 0, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, &mem); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, &mem); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DTexture9_LockRect(texture, 0, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock texture, hr %#x.\n", hr); + ok(locked_rect.Pitch == 128 * 4, "Got unexpected pitch %d.\n", locked_rect.Pitch); + ok(locked_rect.pBits == mem, "Got unexpected pBits %p, expected %p.\n", locked_rect.pBits, mem); + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock texture, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + HeapFree(GetProcessHeap(), 0, mem); + + refcount = IDirect3DDevice9Ex_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: + DestroyWindow(window); + if (d3d9) + IDirect3D9Ex_Release(d3d9); +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -364,4 +450,5 @@ START_TEST(d3d9ex) test_qi_ex_to_base(); test_get_adapter_luid(); test_get_adapter_displaymode_ex(); + test_texture_sysmem_create(); }

1 0

Henri Verbeet : d3d9: Implement texture creation from system memory.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: b171d5f95d3120e58b0f3eec646e8123c4f6b404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b171d5f95d3120e58b0f3eec6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 2 08:15:50 2011 +0100 d3d9: Implement texture creation from system memory. --- dlls/d3d9/device.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2be0002..cdaac6d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -693,13 +693,23 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(IDirect3DDevice9Ex *ifa { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); IDirect3DTexture9Impl *object; + BOOL set_mem = FALSE; HRESULT hr; TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", iface, width, height, levels, usage, format, pool, texture, shared_handle); if (shared_handle) - FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + { + if (pool == D3DPOOL_SYSTEMMEM) + { + if (levels != 1) + return D3DERR_INVALIDCALL; + set_mem = TRUE; + } + else + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -716,6 +726,16 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(IDirect3DDevice9Ex *ifa return hr; } + if (set_mem) + { + struct wined3d_resource *resource; + IDirect3DSurface9Impl *surface; + + resource = wined3d_texture_get_sub_resource(object->wined3d_texture, 0); + surface = wined3d_resource_get_parent(resource); + wined3d_surface_set_mem(surface->wined3d_surface, *shared_handle); + } + TRACE("Created texture %p.\n", object); *texture = &object->IDirect3DTexture9_iface;

1 0

Henri Verbeet : d3d9: Add some FIXMEs for d3d9ex resource sharing.
by Alexandre Julliard 02 Dec '11

02 Dec '11

Module: wine Branch: master Commit: d9ab258df888a63fa893d1c6a4b4c688f5333ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ab258df888a63fa893d1c6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 2 08:15:49 2011 +0100 d3d9: Add some FIXMEs for d3d9ex resource sharing. --- dlls/d3d9/device.c | 45 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e5c9d1e..2be0002 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -698,6 +698,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(IDirect3DDevice9Ex *ifa TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", iface, width, height, levels, usage, format, pool, texture, shared_handle); + if (shared_handle) + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -732,6 +735,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(IDirect3DDevice9E TRACE("usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", usage, format, pool, texture, shared_handle); + if (shared_handle) + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -764,6 +770,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(IDirect3DDevice9Ex TRACE("iface %p, edge_length %u, levels %u, usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", iface, edge_length, levels, usage, format, pool, texture, shared_handle); + if (shared_handle) + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -796,6 +805,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(IDirect3DDevice9Ex TRACE("iface %p, size %u, usage %#x, fvf %#x, pool %#x, buffer %p, shared_handle %p.\n", iface, size, usage, fvf, pool, buffer, shared_handle); + if (shared_handle) + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -828,6 +840,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(IDirect3DDevice9Ex TRACE("iface %p, size %u, usage %#x, format %#x, pool %#x, buffer %p, shared_handle %p.\n", iface, size, usage, format, pool, buffer, shared_handle); + if (shared_handle) + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -886,7 +901,7 @@ static HRESULT IDirect3DDevice9Impl_CreateSurface(IDirect3DDevice9Impl *device, static HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(IDirect3DDevice9Ex *iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, - BOOL Lockable, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle) + BOOL Lockable, IDirect3DSurface9 **ppSurface, HANDLE *shared_handle) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; @@ -894,7 +909,10 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(IDirect3DDevice9Ex TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u.\n" "lockable %#x, surface %p, shared_handle %p.\n", iface, Width, Height, Format, MultiSample, MultisampleQuality, - Lockable, ppSurface, pSharedHandle); + Lockable, ppSurface, shared_handle); + + if (shared_handle) + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); hr = IDirect3DDevice9Impl_CreateSurface(This, Width, Height, Format, Lockable, FALSE /* Discard */, 0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, @@ -906,7 +924,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(IDirect3DDevice9Ex static HRESULT WINAPI IDirect3DDevice9Impl_CreateDepthStencilSurface(IDirect3DDevice9Ex *iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurface, - HANDLE *pSharedHandle) + HANDLE *shared_handle) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; @@ -914,7 +932,10 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateDepthStencilSurface(IDirect3DDe TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u.\n" "discard %#x, surface %p, shared_handle %p.\n", iface, Width, Height, Format, MultiSample, MultisampleQuality, - Discard, ppSurface, pSharedHandle); + Discard, ppSurface, shared_handle); + + if (shared_handle) + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); hr = IDirect3DDevice9Impl_CreateSurface(This, Width, Height, Format, TRUE /* Lockable */, Discard, 0 /* Level */, ppSurface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, @@ -1054,15 +1075,19 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, static HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(IDirect3DDevice9Ex *iface, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, - HANDLE *pSharedHandle) + HANDLE *shared_handle) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; TRACE("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p.\n", - iface, Width, Height, Format, Pool, ppSurface, pSharedHandle); + iface, Width, Height, Format, Pool, ppSurface, shared_handle); + + if (shared_handle) + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - if(Pool == D3DPOOL_MANAGED ){ + if (Pool == D3DPOOL_MANAGED) + { FIXME("Attempting to create a managed offscreen plain surface\n"); return D3DERR_INVALIDCALL; } @@ -2850,6 +2875,9 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateRenderTargetEx(IDirect3DDevic iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle, usage); + if (shared_handle) + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + return E_NOTIMPL; } @@ -2872,6 +2900,9 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(IDirect iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle, usage); + if (shared_handle) + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + return E_NOTIMPL; }

1 0

← Newer
1
...
73
74
75
76
77
78
79
80
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011