wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Henri Verbeet : usp10/tests: Add a latn shaping test with ligatures.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 04cd6029ea7a599c78a36d6a71a4d74bef11d5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cd6029ea7a599c78a36d6a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 2 09:38:39 2017 +0100 usp10/tests: Add a latn shaping test with ligatures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index c5cc401..b8c7b70 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1185,6 +1185,13 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {0,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + static const WCHAR test3[] = {'t', 't', 'f', 'f', 'f', 'i', 0}; + static const shapeTest_char t3_c[] = {{0, {0, 0}}, {0, {0, 0}}, {0, {0, 0}}, + {1, {0, 0}}, {1, {0, 0}}, {1, {0, 0}}}; + static const shapeTest_glyph t3_g[] = { + {1, {{SCRIPT_JUSTIFY_CHARACTER, 1, 0, 0, 0, 0}, 0}}, + {1, {{SCRIPT_JUSTIFY_CHARACTER, 1, 0, 0, 0, 0}, 0}}}; + /* Hebrew */ static const WCHAR test_hebrew[] = {0x05e9, 0x05dc, 0x05d5, 0x05dd,0}; static const shapeTest_char hebrew_c[] = {{3,{0,0}},{2,{0,0}},{1,{0,0}},{0,{0,0}}}; @@ -1467,6 +1474,14 @@ static void test_ScriptShapeOpenType(HDC hdc) test_shape_ok(hdc, test2, 4, &Control, &State, 1, 4, t2_c, glyph_test); + test_valid = find_font_for_range(hdc, "Calibri", 0, test3[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test3, 6, &Control, &State, 0, 2, t3_c, t3_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } + test_valid = find_font_for_range(hdc, "Microsoft Sans Serif", 11, test_hebrew[0], &hfont, &hfont_orig); if (hfont != NULL) {

1 0

Julian Rüger : readme: Update German translation.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: e2f677212a4b417fcb97cde2119f22b6b9ee423b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f677212a4b417fcb97cde21… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 17:15:07 2017 +0100 readme: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.de | 131 ++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2f677212a4b417fcb97c…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 856805b2269aa497820971d213f683bc4d716681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=856805b2269aa497820971d21… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 16:05:25 2017 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 82 ++++++++++++++++++++++------------------------------------------ 1 file changed, 28 insertions(+), 54 deletions(-) diff --git a/po/de.po b/po/de.po index ff7265c..e9c89f2 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-11-22 12:35+0100\n" +"PO-Revision-Date: 2017-03-06 16:05+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -8376,10 +8376,8 @@ msgid "Wine Control Panel" msgstr "Wine-Systemsteuerung" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Konnte Ausführen-Dialog nicht anzeigen (interner Fehler)" +msgstr "Ausführen-Dialog konnte nicht angezeigt werden (interner Fehler)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" @@ -9398,10 +9396,8 @@ msgid "Confidentiality Required" msgstr "Vertraulichkeit erforderlich" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Herunterfahren im Gange.\n" +msgstr "SASL-Bindung im Gange" #: wldap32.rc:48 msgid "No Such Attribute" @@ -11980,67 +11976,57 @@ msgid "(unknown %d)" msgstr "(unbekannt %d)" #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Wert konnte nicht geändert werden." #: regedit.rc:215 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Es konnte kein neuer Schlüssel angelegt werden." #: regedit.rc:216 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Es konnte kein neuer Wert angelegt werden." #: regedit.rc:217 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Der Schlüssel '%1' konnte nicht umbenannt werden.\n" +"Der angegebene Schlüsselname ist bereits vorhanden." #: regedit.rc:218 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Der Wert '%1' konnte nicht umbenannt werden.\n" +"Der angegebene Name ist bereits vorhanden." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Schlüssel konnte nicht gelöscht werden." #: regedit.rc:220 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Schlüssel konnte nicht umbenannt werden." #: regedit.rc:221 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Wert konnte nicht umbenannt werden." #: regedit.rc:222 msgid "" "The keys and values contained in %1 were successfully added to the registry." msgstr "" +"Die in %1 enthaltenen Schlüssel und Werte wurden erfolgreich zur " +"Registrierung hinzugefügt." #: regedit.rc:223 -#, fuzzy -#| msgid "" -#| "regedit: Unable to export '%1'. The specified registry key was not " -#| "found.\n" msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"regedit: '%1' konnte nicht exportiert werden. Der angegebene Schlüssel wurde " -"nicht gefunden.\n" +"%1 konnte nicht importiert werden. Die angegebene Datei ist keine gültige " +"Registrierungsdatei." #: regedit.rc:375 msgid "" @@ -12274,32 +12260,24 @@ msgid "Displays program information, version number and copyright" msgstr "Zeigt Programminformationen, Version und Copyright an" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der Wert '%1' konnte nicht abgefragt werden." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Schlüssel von diesem Typ (%u) können nicht geändert werden" +msgstr "Schlüssel von diesem Typ (%1!u!) können nicht bearbeitet werden." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Der Wert ist zu groß (%u)" +msgstr "Der Wert ist zu groß (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" -msgstr "Bitte bestätigen" +msgstr "Löschen des Wertes bestätigen" #: regedit.rc:191 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Suchfolge '%s' wurde nicht gefunden" +msgstr "Suche abgeschlossen. Die Zeichenfolge '%1' wurde nicht gefunden." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12314,10 +12292,8 @@ msgid "New Value #%d" msgstr "Neuer Wert #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der Schlüssel '%1' konnte nicht abgefragt werden." #: regedit.rc:152 msgid "Adds a new multi-string value" @@ -12325,20 +12301,18 @@ msgstr "Fügt eine neue mehrteilige Zeichenfolge hinzu" #: regedit.rc:174 msgid "Exports selected branch of the registry to a text file" -msgstr "Exportiert den ausgewählten Zweig der Registry in eine Textdatei" +msgstr "Exportiert den ausgewählten Zweig der Registrierung in eine Textdatei" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Bitte bestätigen" +msgstr "Löschen des Schlüssels bestätigen" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Sind Sie sicher, dass Sie den Schlüssel '%1' löschen möchten?" +msgstr "" +"Sind Sie sicher, dass Sie den Schlüssel '%1' und alle Unterschlüssel löschen " +"möchten?" #: regsvr32.rc:32 msgid ""

1 0

Nikolay Sivov : ddraw: Remove referenced to IWineD3D* interfaces.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 84a8f7f457f49bfc8ea524406936a050e5b46d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a8f7f457f49bfc8ea524406… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 5 20:59:47 2017 +0300 ddraw: Remove referenced to IWineD3D* interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 5 +---- dlls/ddraw/surface.c | 42 ++++++++++++------------------------------ 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 1a6f4e1..56a4a6b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4392,10 +4392,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, if (device->index_buffer_size - index_count * sizeof(WORD) < ib_pos) ib_pos = 0; - /* Copy the index stream into the index buffer. A new IWineD3DDevice - * method could be created which takes an user pointer containing the - * indices or a SetData-Method for the index buffer, which overrides the - * index buffer data with our pointer. */ + /* Copy the index stream into the index buffer. */ wined3d_box.left = ib_pos; wined3d_box.right = ib_pos + index_count * sizeof(WORD); ib = wined3d_buffer_get_resource(device->index_buffer); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 710f6cd..59a151b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -950,7 +950,6 @@ static HRESULT WINAPI ddraw_surface1_GetAttachedSurface(IDirectDrawSurface *ifac * Returns: * DD_OK on success * DDERR_INVALIDPARAMS if DDSD is NULL - * For more details, see IWineD3DSurface::LockRect * *****************************************************************************/ static HRESULT surface_lock(struct ddraw_surface *surface, @@ -1005,10 +1004,10 @@ static HRESULT surface_lock(struct ddraw_surface *surface, switch(hr) { /* D3D8 and D3D9 return the general D3DERR_INVALIDCALL error, but ddraw has a more - * specific error. But since IWineD3DSurface::LockRect returns that error in this - * only occasion, keep d3d8 and d3d9 free from the return value override. There are - * many different places where d3d8/9 would have to catch the DDERR_SURFACEBUSY, it - * is much easier to do it in one place in ddraw + * specific error. But since wined3d returns that error in this only occasion, + * keep d3d8 and d3d9 free from the return value override. There are many different + * places where d3d8/9 would have to catch the DDERR_SURFACEBUSY, it is much easier + * to do it in one place in ddraw. */ case WINED3DERR_INVALIDCALL: return DDERR_SURFACEBUSY; default: return hr; @@ -1170,8 +1169,7 @@ static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect, * Rect: Not used by this implementation * * Returns: - * D3D_OK on success - * For more details, see IWineD3DSurface::UnlockRect + * D3D_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pRect) @@ -1537,8 +1535,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons * DDBltFx: Some extended blt parameters, connected to the flags * * Returns: - * D3D_OK on success - * See IWineD3DSurface::Blt for more details + * D3D_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *dst_rect, @@ -2141,7 +2138,6 @@ static HRESULT WINAPI ddraw_surface1_AddOverlayDirtyRect(IDirectDrawSurface *ifa * Returns: * DD_OK on success * DDERR_INVALIDPARAMS if hdc is NULL - * For details, see IWineD3DSurface::GetDC * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *dc) @@ -2241,8 +2237,7 @@ static HRESULT WINAPI ddraw_surface1_GetDC(IDirectDrawSurface *iface, HDC *dc) * hdc: HDC to release * * Returns: - * DD_OK on success - * For more details, see IWineD3DSurface::ReleaseDC + * DD_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC hdc) @@ -2458,8 +2453,7 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO * Flags: Some flags * * Returns: - * D3D_OK on success - * For more details, see IWineD3DSurface::SetPrivateData + * D3D_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_SetPrivateData(IDirectDrawSurface7 *iface, @@ -2507,7 +2501,6 @@ static HRESULT WINAPI ddraw_surface4_SetPrivateData(IDirectDrawSurface4 *iface, * Returns: * DD_OK on success * DDERR_INVALIDPARAMS if Data is NULL - * For more details, see IWineD3DSurface::GetPrivateData * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface, REFGUID tag, void *data, DWORD *size) @@ -2571,8 +2564,7 @@ static HRESULT WINAPI ddraw_surface4_GetPrivateData(IDirectDrawSurface4 *iface, * tag: Tag of the data to free * * Returns: - * D3D_OK on success - * For more details, see IWineD3DSurface::FreePrivateData + * D3D_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_FreePrivateData(IDirectDrawSurface7 *iface, REFGUID tag) @@ -3004,9 +2996,6 @@ static HRESULT WINAPI ddraw_surface1_EnumOverlayZOrders(IDirectDrawSurface *ifac * Params: * Flags: DDGBS_CANBLT or DDGBS_ISBLTDONE * - * Returns: - * See IWineD3DSurface::Blt - * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetBltStatus(IDirectDrawSurface7 *iface, DWORD Flags) { @@ -3176,9 +3165,6 @@ static HRESULT WINAPI ddraw_surface1_GetColorKey(IDirectDrawSurface *iface, DWOR * Params: * Flags: DDGFS_CANFLIP of DDGFS_ISFLIPDONE * - * Returns: - * See IWineD3DSurface::GetFlipStatus - * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetFlipStatus(IDirectDrawSurface7 *iface, DWORD Flags) { @@ -3554,7 +3540,6 @@ static HRESULT WINAPI d3d_texture1_Initialize(IDirect3DTexture *iface, * Returns: * DD_OK, if the surface is usable * DDERR_ISLOST if the surface is lost - * See IWineD3DSurface::IsLost for more details * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_IsLost(IDirectDrawSurface7 *iface) @@ -3612,8 +3597,7 @@ static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface) * doesn't reload its old contents * * Returns: - * DD_OK on success - * See IWineD3DSurface::Restore for more details + * DD_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) @@ -4187,8 +4171,7 @@ static HRESULT WINAPI ddraw_surface7_GetLOD(IDirectDrawSurface7 *iface, DWORD *M * trans: Type of transfer. Some DDBLTFAST_* flags * * Returns: - * DD_OK on success - * For more details, see IWineD3DSurface::BltFast + * DD_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, @@ -5063,8 +5046,7 @@ static HRESULT WINAPI d3d_texture1_Unload(IDirect3DTexture *iface) /***************************************************************************** * IDirect3DTexture2::GetHandle * - * Returns handle for the texture. At the moment, the interface - * to the IWineD3DTexture is used. + * Returns handle for the texture. * * Params: * device: Device this handle is assigned to

1 0

Nikolay Sivov : d3d9: Remove reference to IWineD3DDevice.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: a4be16bfe3cdc91a4e3f1666e0a8d795ff7fd900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4be16bfe3cdc91a4e3f1666e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 5 20:59:46 2017 +0300 d3d9: Remove reference to IWineD3DDevice. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a004a80..74070af 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2120,7 +2120,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire wined3d_mutex_unlock(); if (FAILED(hr)) { - WARN("IWineD3DDevice_EndStateBlock() failed, hr %#x.\n", hr); + WARN("Failed to end the state block, hr %#x.\n", hr); return hr; }

1 0

Bruno Jesus : include: Add missing connection check flags to wininet.h.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 269f19e602e7325fc0aac263c8b0c39bb69338a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=269f19e602e7325fc0aac263c… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 15:28:22 2017 +0100 include: Add missing connection check flags to wininet.h. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wininet.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 39a6646..e9126de 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1708,10 +1708,13 @@ INTERNETAPI BOOL WINAPI InternetAutodial(DWORD,HWND); INTERNETAPI BOOL WINAPI InternetAutodialHangup(DWORD); INTERNETAPI BOOL WINAPI InternetGetConnectedState(LPDWORD ,DWORD); -#define INTERNET_CONNECTION_MODEM 1 -#define INTERNET_CONNECTION_LAN 2 -#define INTERNET_CONNECTION_PROXY 4 -#define INTERNET_CONNECTION_MODEM_BUSY 8 +#define INTERNET_CONNECTION_MODEM 0x01 +#define INTERNET_CONNECTION_LAN 0x02 +#define INTERNET_CONNECTION_PROXY 0x04 +#define INTERNET_CONNECTION_MODEM_BUSY 0x08 +#define INTERNET_RAS_INSTALLED 0x10 +#define INTERNET_CONNECTION_OFFLINE 0x20 +#define INTERNET_CONNECTION_CONFIGURED 0x40 typedef DWORD (CALLBACK *PFN_DIAL_HANDLER) (HWND,LPCSTR,DWORD,LPDWORD);

1 0

Bruno Jesus : wininet: Forward InternetGetConnectedState to Ex function.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 36f6387e5cab16a2343ce76ed24a95479f5cdcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f6387e5cab16a2343ce76ed… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 01:24:29 2017 -0300 wininet: Forward InternetGetConnectedState to Ex function. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 02379c2..91678b6 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1182,11 +1182,7 @@ BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved) { TRACE("(%p, 0x%08x)\n", lpdwStatus, dwReserved); - if (lpdwStatus) { - WARN("always returning LAN connection.\n"); - *lpdwStatus = INTERNET_CONNECTION_LAN; - } - return TRUE; + return InternetGetConnectedStateExW(lpdwStatus, NULL, 0, dwReserved); }

1 0

Hugh McMaster : regedit/tests: Add some line concatenation tests.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: a3c9a2682cbec89ab41783f21985d59cb13db12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c9a2682cbec89ab41783f21… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 6 12:35:31 2017 +0000 regedit/tests: Add some line concatenation tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index c82dfe3..eacb583 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -471,6 +471,31 @@ static void test_invalid_import(void) "\"Test11\"=\"Value\"\n"); verify_reg_nonexist(hkey, "Test11"); + /* Test multi-line import with incorrect comma placement */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg_nonexist(hkey, "Multi-Line1"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Multi-Line2"); + + exec_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line3\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg_nonexist(hkey, "Multi-Line3"); + + exec_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line4\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Multi-Line4"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Henri Verbeet : wined3d: Merge wined3d_texture_check_block_align() into wined3d_texture_check_box_dimensions().
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: c51537ba9fffee96bfe50c3fc5e828045d2d57a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51537ba9fffee96bfe50c3fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 6 10:45:26 2017 +0100 wined3d: Merge wined3d_texture_check_block_align() into wined3d_texture_check_box_dimensions(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 81 +++++++-------------------------------- dlls/wined3d/texture.c | 87 ++++++++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 52 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c51537ba9fffee96bfe50…

1 0

Henri Verbeet : wined3d: Check rectangle alignment in wined3d_surface_blt( ).
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: d11878891736a92ceb7c83fdbf96255c9d4c8124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11878891736a92ceb7c83fdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 6 10:45:25 2017 +0100 wined3d: Check rectangle alignment in wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 51200d2..12ec0de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3183,22 +3183,6 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int goto release; } - if (!wined3d_texture_check_block_align(src_texture, - src_sub_resource_idx % src_texture->level_count, src_box)) - { - WARN("Source rectangle not block-aligned.\n"); - hr = WINED3DERR_INVALIDCALL; - goto release; - } - - if (!wined3d_texture_check_block_align(dst_texture, - dst_sub_resource_idx % dst_texture->level_count, dst_box)) - { - WARN("Destination rectangle not block-aligned.\n"); - hr = WINED3DERR_INVALIDCALL; - goto release; - } - hr = surface_cpu_blt_compressed(sbase, dbuf, src_map.row_pitch, dst_map.row_pitch, dst_width, dst_height, src_format, flags, fx); @@ -3684,6 +3668,14 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst return WINEDDERR_INVALIDRECT; } + if ((dst_texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + && !wined3d_texture_check_block_align(dst_texture, + dst_sub_resource_idx % dst_texture->level_count, &dst_box)) + { + WARN("Destination rectangle not block-aligned.\n"); + return WINED3DERR_INVALIDCALL; + } + if (src_texture) { src_w = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); @@ -3696,6 +3688,14 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst WARN("The application gave us a bad source rectangle.\n"); return WINEDDERR_INVALIDRECT; } + + if ((src_texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + && !wined3d_texture_check_block_align(src_texture, + src_sub_resource_idx % src_texture->level_count, &src_box)) + { + WARN("Source rectangle not block-aligned.\n"); + return WINED3DERR_INVALIDCALL; + } } if (!fx || !(fx->fx))

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
72
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 March 2017