December 2013 - Wine-commits

Stefan Dösinger : ddraw/tests: Port test_set_surface_desc to other versions.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: eb361e9eeced7e8c98f46b1b109345293929cc4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb361e9eeced7e8c98f46b1b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 3 13:44:33 2013 +0100 ddraw/tests: Port test_set_surface_desc to other versions. --- dlls/ddraw/tests/ddraw2.c | 259 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 251 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 251 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/dsurface.c | 253 ------------------------------------------ 4 files changed, 761 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb361e9eeced7e8c98f46…

1 0

Stefan Dösinger : ddraw: SetSurfaceDesc is not allowed on managed textures.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 1f3660588610fa35c95698ffe353aa28a7434893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3660588610fa35c95698ffe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 3 13:44:34 2013 +0100 ddraw: SetSurfaceDesc is not allowed on managed textures. --- dlls/ddraw/surface.c | 3 +- dlls/ddraw/tests/ddraw2.c | 91 ++++++++++++++++++++++++++++---------------- dlls/ddraw/tests/ddraw4.c | 86 ++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 88 ++++++++++++++++++++++++++++--------------- 4 files changed, 175 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f3660588610fa35c9569…

1 0

Stefan Dösinger : ddraw: SetSurfaceDesc accepts DDSD_CAPS with dwCaps=0.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: c15d89c803f8ac7f7052cec448d8e3a26f5a3205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15d89c803f8ac7f7052cec44… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 3 13:44:35 2013 +0100 ddraw: SetSurfaceDesc accepts DDSD_CAPS with dwCaps=0. --- dlls/ddraw/surface.c | 2 +- dlls/ddraw/tests/ddraw2.c | 10 +++++++++- dlls/ddraw/tests/ddraw4.c | 13 ++++++++++++- dlls/ddraw/tests/ddraw7.c | 13 ++++++++++++- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index efa7f66..9966e50 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4264,7 +4264,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, WARN("DDSD_LPSURFACE is not set, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; } - if (DDSD->dwFlags & DDSD_CAPS) + if ((DDSD->dwFlags & DDSD_CAPS) && DDSD->ddsCaps.dwCaps) { WARN("DDSD_CAPS is set, returning DDERR_INVALIDCAPS.\n"); return DDERR_INVALIDCAPS; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 154e1b2..ff03207 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4476,6 +4476,7 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); @@ -4485,7 +4486,7 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Setting DDSD_CAPS returned %#x.\n", hr); - /* TODO: The INVALIDCAPS return value suggests that some caps can be set. */ + /* dwCaps = 0 is allowed, but ignored. */ ddsd.dwFlags = DDSD_CAPS | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); @@ -4493,6 +4494,13 @@ static void test_set_surface_desc(void) ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); + ddsd.ddsCaps.dwCaps = 0; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ reset_ddsd(&ddsd); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6012f73..cfc2ac4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5077,6 +5077,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); @@ -5086,7 +5088,7 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Setting DDSD_CAPS returned %#x.\n", hr); - /* TODO: The INVALIDCAPS return value suggests that some caps can be set. */ + /* dwCaps = 0 is allowed, but ignored. Caps2 can be anything and is ignored too. */ ddsd.dwFlags = DDSD_CAPS | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); @@ -5094,6 +5096,15 @@ static void test_set_surface_desc(void) ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); + ddsd.ddsCaps.dwCaps = 0; + ddsd.ddsCaps.dwCaps2 = 0xdeadbeef; + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ reset_ddsd(&ddsd); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 26bb82c..72e7f2e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4964,6 +4964,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); @@ -4973,7 +4975,7 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Setting DDSD_CAPS returned %#x.\n", hr); - /* TODO: The INVALIDCAPS return value suggests that some caps can be set. */ + /* dwCaps = 0 is allowed, but ignored. Caps2 can be anything and is ignored too. */ ddsd.dwFlags = DDSD_CAPS | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); @@ -4981,6 +4983,15 @@ static void test_set_surface_desc(void) ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); + ddsd.ddsCaps.dwCaps = 0; + ddsd.ddsCaps.dwCaps2 = 0xdeadbeef; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ reset_ddsd(&ddsd);

1 0

Stefan Dösinger : ddraw: Check for lpSurface= NULL in SetSurfaceDesc.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 5e43ee256c03e7703a91913192a54014acdec361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e43ee256c03e7703a9191319… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 3 13:44:36 2013 +0100 ddraw: Check for lpSurface=NULL in SetSurfaceDesc. --- dlls/ddraw/surface.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++++ dlls/ddraw/tests/ddraw4.c | 4 ++++ dlls/ddraw/tests/ddraw7.c | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9966e50..dcff746 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4259,9 +4259,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, WARN("Invalid flags (0x%08x) set, returning DDERR_INVALIDPARAMS\n", DDSD->dwFlags); return DDERR_INVALIDPARAMS; } - if (!(DDSD->dwFlags & DDSD_LPSURFACE)) + if (!(DDSD->dwFlags & DDSD_LPSURFACE) || !DDSD->lpSurface) { - WARN("DDSD_LPSURFACE is not set, returning DDERR_INVALIDPARAMS\n"); + WARN("DDSD_LPSURFACE is not set or lpSurface is NULL, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; } if ((DDSD->dwFlags & DDSD_CAPS) && DDSD->ddsCaps.dwCaps) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ff03207..209a473 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4471,6 +4471,10 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr); + ddsd.lpSurface = NULL; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Setting lpSurface=NULL returned %#x.\n", hr); + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, NULL, 0); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with NULL desc returned %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index cfc2ac4..e7beb3f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5072,6 +5072,10 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr); + ddsd.lpSurface = NULL; + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Setting lpSurface=NULL returned %#x.\n", hr); + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, NULL, 0); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with NULL desc returned %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 72e7f2e..76ff437 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4959,6 +4959,10 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr); + ddsd.lpSurface = NULL; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Setting lpSurface=NULL returned %#x.\n", hr); + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, NULL, 0); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with NULL desc returned %#x.\n", hr);

1 0

Stefan Dösinger : ddraw/tests: Test SetSurfaceDesc and Lock interaction.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 42470bae678508490d2b2c62f59d58ede72c9797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42470bae678508490d2b2c62f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 3 13:44:37 2013 +0100 ddraw/tests: Test SetSurfaceDesc and Lock interaction. --- dlls/ddraw/tests/ddraw2.c | 14 ++++++++++++++ dlls/ddraw/tests/ddraw4.c | 14 ++++++++++++++ dlls/ddraw/tests/ddraw7.c | 15 +++++++++++++++ 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 209a473..417e0be 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4467,7 +4467,21 @@ static void test_set_surface_desc(void) /* Redundantly setting the same lpSurface is not an error. */ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == NULL, "lpSurface is %p, expected NULL.\n", ddsd.lpSurface); + + hr = IDirectDrawSurface3_Lock(surface3, NULL, &ddsd, 0, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == data, "lpSurface is %p, expected %p.\n", data, data); + hr = IDirectDrawSurface3_Unlock(surface3, NULL); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e7beb3f..b1b01bb 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5068,7 +5068,21 @@ static void test_set_surface_desc(void) /* Redundantly setting the same lpSurface is not an error. */ hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == NULL, "lpSurface is %p, expected NULL.\n", ddsd.lpSurface); + + hr = IDirectDrawSurface4_Lock(surface, NULL, &ddsd, 0, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == data, "lpSurface is %p, expected %p.\n", data, data); + hr = IDirectDrawSurface4_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 76ff437..fe1d35f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4956,6 +4956,21 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == NULL, "lpSurface is %p, expected NULL.\n", ddsd.lpSurface); + + hr = IDirectDrawSurface7_Lock(surface, NULL, &ddsd, 0, NULL); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(!(ddsd.dwFlags & DDSD_LPSURFACE), "DDSD_LPSURFACE is set.\n"); + ok(ddsd.lpSurface == data, "lpSurface is %p, expected %p.\n", data, data); + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr);

1 0

Alexandre Julliard : makedep: Allow the source directory itself in include paths.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 4674566ba4d9f523dd48bbe4af131c2a0b136394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4674566ba4d9f523dd48bbe4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 2 23:28:58 2013 +0100 makedep: Allow the source directory itself in include paths. --- tools/makedep.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 164b7e4..1d99762 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -536,7 +536,7 @@ static FILE *open_include_file( struct incl_file *pFile ) { FILE *file = NULL; char *filename, *p; - unsigned int i; + unsigned int i, len; errno = ENOENT; @@ -664,8 +664,9 @@ static FILE *open_include_file( struct incl_file *pFile ) { /* ignore absolute paths that don't point into the source dir */ if (!top_src_dir) continue; - if (strncmp( dir, top_src_dir, strlen(top_src_dir) )) continue; - if (dir[strlen(top_src_dir)] != '/') continue; + len = strlen( top_src_dir ); + if (strncmp( dir, top_src_dir, len )) continue; + if (dir[len] && dir[len] != '/') continue; } filename = strmake( "%s/%s", dir, pFile->name ); if ((file = fopen( filename, "r" ))) goto found;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 0e9899fa8c76c9e5adf3b476c860f36993c98aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9899fa8c76c9e5adf3b476c… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Dec 2 22:42:39 2013 +0100 po: Update German translation. --- po/de.po | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/po/de.po b/po/de.po index d8892d8..55fa346 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: 2013-11-07 16:38+0100\n" +"PO-Revision-Date: 2013-12-02 22:42+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -12814,10 +12814,8 @@ msgid "Select Drive Letter" msgstr "Laufwerksbuchstaben wählen" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Wine-Konfiguration" +msgstr "Laufwerkskonfiguration" #: winecfg.rc:227 msgid "" @@ -13097,10 +13095,8 @@ msgid "Letter" msgstr "Buchst." #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Neuer Ordner" +msgstr "Zielverzeichnis" #: winecfg.rc:79 msgid ""

1 0

André Hentschel : comctl32/tests: Make trackbar. c compile with -D__WINESRC__.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 66932a8855f481838ba9ee7e260dd66019c01559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66932a8855f481838ba9ee7e2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 2 23:07:08 2013 +0100 comctl32/tests: Make trackbar.c compile with -D__WINESRC__. --- dlls/comctl32/tests/trackbar.c | 398 ++++++++++++++++++++-------------------- 1 files changed, 196 insertions(+), 202 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66932a8855f481838ba9e…

1 0

Rico Schüller : Fix German release date for wine 1.7.7
by Jeremy Newman 02 Dec '13

02 Dec '13

Module: website Branch: master Commit: 04359649624316bbae5d8e75c0c0f794f58d003b URL: http://source.winehq.org/git/website.git/?a=commit;h=04359649624316bbae5d8e… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 2 16:21:21 2013 -0600 Fix German release date for wine 1.7.7 --- news/de/2013112201.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/de/2013112201.xml b/news/de/2013112201.xml index 8346641..9c94321 100644 --- a/news/de/2013112201.xml +++ b/news/de/2013112201.xml @@ -1,5 +1,5 @@ <news> -<date>2. November 2013</date> +<date>22. November 2013</date> <title>Wine 1.7.7 freigegeben</title> <body> Die Entwicklungsversion 1.7.7 von Wine ist jetzt verfügbar.

1 0

Andrey Gusev : Add Ukrainian translation for help template
by Jeremy Newman 02 Dec '13

02 Dec '13

Module: website Branch: master Commit: a875c403bc560d37f5b3bca38ccb02bd1d37710b URL: http://source.winehq.org/git/website.git/?a=commit;h=a875c403bc560d37f5b3bc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 28 21:43:19 2013 +0200 Add Ukrainian translation for help template --- templates/uk/help.template | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/templates/uk/help.template b/templates/uk/help.template new file mode 100644 index 0000000..e56d88c --- /dev/null +++ b/templates/uk/help.template @@ -0,0 +1,91 @@ + + + +<h1 class="title">Отримати допомогу</h1> + +Є різноманітні способи отримати допомогу у використанні Wine. + +<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> + + <tr> + <td align="center" bgcolor="black" class="small">Варіант</td> + <td align="center" bgcolor="black" class="small">Опис</td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://www.codeweavers.com"><img src="{$root}/images/paid.png"> Платний</a> + </td> + <td valign="top"> + <a href="http://www.codeweavers.com">CodeWeavers</a> пропонує платну підтримку для Wine. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://wiki.winehq.org/FAQ"><img src="{$root}/images/faq.png"> FAQ</a> + </td> + <td valign="top"> + На більшість питань можна швидко знайти відповідь перейшовши до <a href="http://wiki.winehq.org/FAQ">FAQ</a>. Це перший розділ, який варто подивитися, бо можливо там вже є відповідь на ваше питання. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="{$root}/documentation"><img src="{$root}/images/docs.png"> Документи</a> + </td> + <td valign="top"> + Ми рекомендуємо вам почитати нашу онлайн <a href="{$root}/site/documentation">Документацію</a>, щоб знайти відповідь на своє питання. Також будуть цікаві наші <a href="http://wiki.winehq.org/HowTo">Практичні рекомендації</a>, які містять деяку корисну інформацію для новачків. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"> Wiki</a> + </td> + <td valign="top"> + Подивіться нашу <a href="http://wiki.winehq.org/">Wiki</a>, щоб знайти відповідь на своє питання. + </td> + </tr> + +<tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="//forums.winehq.org/"><img src="{$root}/images/forum.png"> Форум</a> + </td> + <td valign="top"> + У нас є <a href="//forums.winehq.org/">форум</a>/<a href="{$root}/site/forums">списки розсилки</a> на основі співтовариства для користувачів Wine, це місце де користувачі Wine можуть задати питання та спілкуватися один з одним. Ви також можете досліджувати <a href="{$root}/site/forums">списки розсилки</a>, які складають це співтовариство. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="{$root}/irc"><img src="{$root}/images/irc.png"> IRC</a> + </td> + <td valign="top"> + Ви можете зв'язатися зі спільнотою Wine на нашому <a href="{$root}/irc">IRC каналі</a>. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="//appdb.winehq.org/"><img src="{$root}/images/appdb.png"> AppDB</a> + </td> + <td valign="top"> + Якщо ви хочете допомогти з додатками, тоді подивіться нашу <a href="//appdb.winehq.org/">Базу застосунків</a>. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="//bugs.winehq.org/"><img src="{$root}/images/bugs.png"> Bugzilla</a> + </td> + <td valign="top"> + Наш <a href="//bugs.winehq.org/">Bugzilla Bug Tracker</a> містить всі питання над якими ми працювали або працюємо зараз. + </td> + </tr> + +</table> + +Проблеми з нашим сайтом або помітили помилку? Зв'яжіться з нашою <a href="mailto:web-admin(a)winehq.org">Веб-групою</a>. + +

1 0