August 2011 - Wine-Commits - list.winehq.org

Stefan Dösinger : ddraw: Add a test for DDSD_ZBUFFERBITDEPTH and DDSD_PIXELFORMAT.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 05b3222b397569774893ea3d653e8b3cb3faf2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b3222b397569774893ea3d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 30 12:11:39 2011 +0200 ddraw: Add a test for DDSD_ZBUFFERBITDEPTH and DDSD_PIXELFORMAT. --- dlls/ddraw/tests/dsurface.c | 89 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 75646d6..b4e158b 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4027,6 +4027,94 @@ static void zbufferbitdepth_test(void) ddsd.dwZBufferBitDepth); } +static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const char *name) +{ + IDirectDrawSurface *surface; + IDirectDrawSurface7 *surface7; + HRESULT hr; + DDSURFACEDESC out; + DDSURFACEDESC2 out2; + + hr = IDirectDraw_CreateSurface(lpDD, ddsd, &surface, NULL); + if (hr == DDERR_NOZBUFFERHW) + { + skip("Z buffers not supported, skipping Z flag test\n"); + return; + } + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **) &surface7); + ok(SUCCEEDED(hr), "IDirectDrawSurface_QueryInterface failed, hr %#x.\n", hr); + + reset_ddsd(&out); + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &out); + ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr); + memset(&out2, 0, sizeof(out2)); + out2.dwSize = sizeof(out2); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface7, &out2); + ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr); + + if (expect_pf) + { + ok(out.dwFlags & DDSD_PIXELFORMAT, "%s surface: Expected DDSD_PIXELFORMAT to be set\n", name); + } + else + { + ok(!(out.dwFlags & DDSD_PIXELFORMAT), "%s surface: Expected DDSD_PIXELFORMAT not to be set\n", name); + ok(out2.dwFlags & DDSD_PIXELFORMAT, + "%s surface: Expected DDSD_PIXELFORMAT to be set in DDSURFACEDESC2\n", name); + } + if (expect_zd) + { + ok(out.dwFlags & DDSD_ZBUFFERBITDEPTH, "%s surface: Expected DDSD_ZBUFFERBITDEPTH to be set\n", name); + ok(!(out2.dwFlags & DDSD_ZBUFFERBITDEPTH), + "%s surface: Did not expect DDSD_ZBUFFERBITDEPTH to be set in DDSURFACEDESC2\n", name); + } + else + { + ok(!(out.dwFlags & DDSD_ZBUFFERBITDEPTH), "%s surface: Expected DDSD_ZBUFFERBITDEPTH not to be set\n", name); + } + + IDirectDrawSurface7_Release(surface7); + IDirectDrawSurface_Release(surface); +} + +static void pixelformat_flag_test(void) +{ + DDSURFACEDESC ddsd; + DDCAPS caps; + HRESULT hr; + + memset(&caps, 0, sizeof(caps)); + caps.dwSize = sizeof(caps); + hr = IDirectDraw_GetCaps(lpDD, &caps, NULL); + ok(SUCCEEDED(hr), "IDirectDraw_GetCaps failed, hr %#x.\n", hr); + if (!(caps.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + { + skip("Z buffers not supported, skipping DDSD_PIXELFORMAT test\n"); + return; + } + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + test_ddsd(&ddsd, TRUE, FALSE, "offscreen plain"); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + test_ddsd(&ddsd, TRUE, FALSE, "primary"); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_ZBUFFERBITDEPTH; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.dwZBufferBitDepth = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + test_ddsd(&ddsd, FALSE, TRUE, "Z buffer"); +} + START_TEST(dsurface) { HRESULT ret; @@ -4085,5 +4173,6 @@ START_TEST(dsurface) CreateSurfaceBadCapsSizeTest(); no_ddsd_caps_test(); zbufferbitdepth_test(); + pixelformat_flag_test(); ReleaseDirectDraw(); }

1 0

Stefan Dösinger : ddraw: Set dwZBufferBitDepth in old z buffers.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 6176eb87de435a6d20399015aa603027f0a4062e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6176eb87de435a6d20399015a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 30 12:46:41 2011 +0200 ddraw: Set dwZBufferBitDepth in old z buffers. --- dlls/ddraw/tests/dsurface.c | 12 ++++++------ dlls/ddraw/utils.c | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index e06956e..75646d6 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3950,7 +3950,7 @@ static void zbufferbitdepth_test(void) IDirectDrawSurface_Release(surface); ok(ddsd.dwFlags & DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH is not set\n"); - todo_wine ok(!(ddsd.dwFlags & DDSD_PIXELFORMAT), "DDSD_PIXELFORMAT is set\n"); + ok(!(ddsd.dwFlags & DDSD_PIXELFORMAT), "DDSD_PIXELFORMAT is set\n"); /* Yet the ddpfPixelFormat member contains valid data */ if (memcmp(&ddsd.ddpfPixelFormat, &test_data[i].pf, ddsd.ddpfPixelFormat.dwSize)) { @@ -3982,8 +3982,8 @@ static void zbufferbitdepth_test(void) ok(ddsd.ddpfPixelFormat.dwZBufferBitDepth == 16, "Expected a 16bpp depth buffer, got %ubpp\n", ddsd.ddpfPixelFormat.dwZBufferBitDepth); ok(ddsd.dwFlags & DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH is not set\n"); - todo_wine ok(!(ddsd.dwFlags & DDSD_PIXELFORMAT), "DDSD_PIXELFORMAT is set\n"); - todo_wine ok(ddsd.dwZBufferBitDepth == 16, "Expected dwZBufferBitDepth=16, got %u\n", + ok(!(ddsd.dwFlags & DDSD_PIXELFORMAT), "DDSD_PIXELFORMAT is set\n"); + ok(ddsd.dwZBufferBitDepth == 16, "Expected dwZBufferBitDepth=16, got %u\n", ddsd.dwZBufferBitDepth); /* DDSD_PIXELFORMAT vs invalid ZBUFFERBITDEPTH */ @@ -4021,9 +4021,9 @@ static void zbufferbitdepth_test(void) IDirectDrawSurface_Release(surface); ok(ddsd.ddpfPixelFormat.dwZBufferBitDepth == 16, "Expected a 16bpp depth buffer, got %ubpp\n", ddsd.ddpfPixelFormat.dwZBufferBitDepth); - todo_wine ok(ddsd.dwFlags & DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH is not set\n"); - todo_wine ok(!(ddsd.dwFlags & DDSD_PIXELFORMAT), "DDSD_PIXELFORMAT is set\n"); - todo_wine ok(ddsd.dwZBufferBitDepth == 16, "Expected dwZBufferBitDepth=16, got %u\n", + ok(ddsd.dwFlags & DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH is not set\n"); + ok(!(ddsd.dwFlags & DDSD_PIXELFORMAT), "DDSD_PIXELFORMAT is set\n"); + ok(ddsd.dwZBufferBitDepth == 16, "Expected dwZBufferBitDepth=16, got %u\n", ddsd.dwZBufferBitDepth); } diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index fce00eb..63c6a5e 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -1192,7 +1192,7 @@ void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) * though. Don't forget to set ddsCaps.dwCaps2/3/4 to 0 when removing this */ memset(out, 0x00, sizeof(*out)); out->dwSize = sizeof(*out); - out->dwFlags = in->dwFlags; + out->dwFlags = in->dwFlags & ~DDSD_ZBUFFERBITDEPTH; if (in->dwFlags & DDSD_WIDTH) out->dwWidth = in->dwWidth; if (in->dwFlags & DDSD_HEIGHT) out->dwHeight = in->dwHeight; if (in->dwFlags & DDSD_PIXELFORMAT) out->u4.ddpfPixelFormat = in->ddpfPixelFormat; @@ -1236,7 +1236,18 @@ void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) out->dwFlags = in->dwFlags; if (in->dwFlags & DDSD_WIDTH) out->dwWidth = in->dwWidth; if (in->dwFlags & DDSD_HEIGHT) out->dwHeight = in->dwHeight; - if (in->dwFlags & DDSD_PIXELFORMAT) out->ddpfPixelFormat = in->u4.ddpfPixelFormat; + if (in->dwFlags & DDSD_PIXELFORMAT) + { + out->ddpfPixelFormat = in->u4.ddpfPixelFormat; + if ((in->dwFlags & DDSD_CAPS) && (in->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + { + /* Z buffers have DDSD_ZBUFFERBITDEPTH set, but not DDSD_PIXELFORMAT. They do + * have valid data in ddpfPixelFormat though */ + out->dwFlags &= ~DDSD_PIXELFORMAT; + out->dwFlags |= DDSD_ZBUFFERBITDEPTH; + out->u2.dwZBufferBitDepth = in->u4.ddpfPixelFormat.u1.dwZBufferBitDepth; + } + } /* ddsCaps is read even without DDSD_CAPS set. See dsurface:no_ddsd_caps_test */ out->ddsCaps.dwCaps = in->ddsCaps.dwCaps; if (in->dwFlags & DDSD_PITCH) out->u1.lPitch = in->u1.lPitch;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 1103cb9327ce181fdd8c1136ec5d6236d92f6908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1103cb9327ce181fdd8c1136e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Aug 31 18:43:00 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 49 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index 82c0fef..7d08151 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,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: 2011-08-23 21:32+0300\n" +"PO-Revision-Date: 2011-08-31 18:41+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -804,9 +804,8 @@ msgid "Initials" msgstr "Inicialai" #: crypt32.rc:80 -#, fuzzy msgid "Surname" -msgstr "Naudotojas" +msgstr "Pavardė" #: crypt32.rc:81 msgid "Domain Component" @@ -8125,6 +8124,14 @@ msgid "" "Specifying no file type after the equal sign removes the current " "association, if any.\n" msgstr "" +"ASSOC parodo ar modifikuoja failų prievardžių sąsajas\n" +"\n" +"Sintaksė: ASSOC [.prv[=[failoTipas]]]\n" +"\n" +"ASSOC be parametrų parodo dabartines failų sąsajas.\n" +"Jei naudojama tik su failo prievardžiu, parodo dabartinę sąsają.\n" +"Po lygybės ženklo nenurodžius failo tipo pašalina dabartinę sąsają, jei " +"yra.\n" #: cmd.rc:243 msgid "" @@ -8139,6 +8146,16 @@ msgid "" "Specifying no open command after the equal sign removes the command string " "associated to the specified file type.\n" msgstr "" +"FTYPE parodo ar modifikuoja atvėrimo komandas susietas su failų tipais\n" +"\n" +"Sintaksė: FTYPE [failoTipas[=[atvėrimoKomanda]]]\n" +"\n" +"Be parametrų parodo failų tipus, kuriems apibrėžtos atvėrimo komandų " +"eilutės.\n" +"Jei naudojama tik su failų tipu, parodo susietą atvėrimo komandos eilutę, " +"jei yra.\n" +"Po lygybės ženklo nenurodžius atvėrimo komandos pašalina su nurodytu failo " +"tipu susietą komandos eilutę.\n" #: cmd.rc:245 msgid "MORE displays output of files or piped input in pages.\n" @@ -8163,7 +8180,6 @@ msgstr "" "ar apvalkalą iš kur CMD buvo iškviestas.\n" #: cmd.rc:288 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8202,6 +8218,7 @@ msgid "" "Enter HELP <command> for further information on any of the above commands\n" msgstr "" "CMD įtaisytos komandos yra:\n" +"ASSOC\t\tRodyti ar modifikuoti failų prievardžių sąsajas\n" "ATTRIB\t\tRodyti ar keisti DOS failo požymius\n" "CALL\t\tKviesti komandų failą iš kito komandų failo\n" "CD (CHDIR)\tPakeisti dabartinį numatytą katalogą\n" @@ -8214,6 +8231,7 @@ msgstr "" "DIR\t\tPateikti katalogo turinį\n" "ECHO\t\tKopijuoti tekstą tiesiai į pulto išvedimą\n" "ENDLOCAL\tBaigia aplinkos pakeitimų lokalizavimą komandų faile\n" +"FTYPE\t\tRodyti ar modifikuoti atvėrimo komandas susietas su failų tipais\n" "HELP\t\tParodyti trumpą pagalbą apie temą\n" "MD (MKDIR)\tSukurti pakatalogį\n" "MORE\t\tRodyti išvedimą puslapiais\n" @@ -8482,7 +8500,6 @@ msgid "Default gateway" msgstr "Numatytasis šliuzas" #: net.rc:27 -#, fuzzy msgid "" "The syntax of this command is:\n" "\n" @@ -8494,12 +8511,11 @@ msgid "" msgstr "" "Šios komandos sintaksė yra:\n" "\n" -"NET HELP komanda\n" +"NET komanda [argumentai]\n" " -arba-\n" "NET komanda /HELP\n" "\n" -" Galimos komandos yra:\n" -" NET HELP NET START NET STOP NET USE\n" +"Kur „komanda“ yra viena iš HELP, START, STOP ar USE\n" #: net.rc:28 msgid "" @@ -8510,6 +8526,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" +"Šios komandos sintaksė yra:\n" +"\n" +"NET START [tarnyba]\n" +"\n" +"Parodo vykdomų tarnybų sąrašą, jei „tarnyba“ praleista. Priešingu atveju " +"„tarnyba“ yra paleidžiamos tarnybos pavadinimas.\n" #: net.rc:29 msgid "" @@ -8519,6 +8541,11 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" +"Šios komandos sintaksė yra:\n" +"\n" +"NET STOP tarnyba\n" +"\n" +"Kur „tarnyba“ yra stabdomos tarnybos pavadinimas.\n" #: net.rc:30 msgid "Stopping dependent service: %s\n" @@ -8603,9 +8630,8 @@ msgid "Reconnecting" msgstr "Jungiamasi iš naujo" #: net.rc:40 -#, fuzzy msgid "The following services are running:\n" -msgstr "Priklausomos tarnybos yra vykdomos\n" +msgstr "Šios tarnybos yra vykdomos:\n" #: notepad.rc:27 msgid "&New\tCtrl+N" @@ -10270,9 +10296,8 @@ msgid "Drives" msgstr "Diskai" #: winecfg.rc:41 -#, fuzzy msgid "Select the Unix target directory, please." -msgstr "Prašome išsirinkti unix paskirties aplanką." +msgstr "Prašome išsirinkti Unix paskirties aplanką." #: winecfg.rc:43 msgid "Show &Advanced"

1 0

Stefan Dösinger : ddraw: Introduce a function to convert a DDSURFACEDESC2 to a DDSURFACEDESC.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: c42277883a5764271c3bd5949c948c6efbabe0c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c42277883a5764271c3bd5949… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 15:00:59 2011 +0200 ddraw: Introduce a function to convert a DDSURFACEDESC2 to a DDSURFACEDESC. --- dlls/ddraw/ddraw.c | 7 ++++--- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 11 ++++++++++- dlls/ddraw/utils.c | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e889815..c23b8bf 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1328,6 +1328,7 @@ static HRESULT WINAPI ddraw3_GetDisplayMode(IDirectDraw3 *iface, DDSURFACEDESC * TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); + /* FIXME: Test sizes, properly convert surface_desc */ return ddraw7_GetDisplayMode(&This->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); } @@ -1337,6 +1338,7 @@ static HRESULT WINAPI ddraw2_GetDisplayMode(IDirectDraw2 *iface, DDSURFACEDESC * TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); + /* FIXME: Test sizes, properly convert surface_desc */ return ddraw7_GetDisplayMode(&This->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); } @@ -1346,6 +1348,7 @@ static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *s TRACE("iface %p, surface_desc %p.\n", iface, surface_desc); + /* FIXME: Test sizes, properly convert surface_desc */ return ddraw7_GetDisplayMode(&This->IDirectDraw7_iface, (DDSURFACEDESC2 *)surface_desc); } @@ -2118,9 +2121,7 @@ static HRESULT CALLBACK EnumDisplayModesCallbackThunk(DDSURFACEDESC2 *surface_de struct displaymodescallback_context *cbcontext = context; DDSURFACEDESC desc; - memcpy(&desc, surface_desc, sizeof(desc)); - desc.dwSize = sizeof(desc); - + DDSD2_to_DDSD(surface_desc, &desc); return cbcontext->func(&desc, cbcontext->context); } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0e4fe8d..2c3ab8f 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -556,6 +556,7 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in) DECLSPEC_HIDDEN; void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN; void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) DECLSPEC_HIDDEN; +void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN; /* This only needs to be here as long the processvertices functionality of * IDirect3DExecuteBuffer isn't in WineD3D */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a8142eb..c7d52d7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -972,6 +972,8 @@ static HRESULT WINAPI ddraw_surface3_Lock(IDirectDrawSurface3 *iface, RECT *rect TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); + /* All versions of Lock() accept both sizeof(DDSURFACEDESC) and + * sizeof(DDSURFACEDESC2) structures and do not touch the dwSize member */ return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, rect, (DDSURFACEDESC2 *)surface_desc, flags, h); } @@ -983,6 +985,10 @@ static HRESULT WINAPI ddraw_surface2_Lock(IDirectDrawSurface2 *iface, RECT *rect TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); + /* All versions of Lock() accept both sizeof(DDSURFACEDESC) and + * sizeof(DDSURFACEDESC2) structures and do not touch the dwSize member + * + * TODO: Test DDSD_ZBUFFERBITDEPTH behavior */ return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, rect, (DDSURFACEDESC2 *)surface_desc, flags, h); } @@ -994,6 +1000,8 @@ static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect, TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); + /* All versions of Lock() accept both sizeof(DDSURFACEDESC) and + * sizeof(DDSURFACEDESC2) structures and do not touch the dwSize member */ return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, rect, (DDSURFACEDESC2 *)surface_desc, flags, h); } @@ -2310,6 +2318,7 @@ static HRESULT CALLBACK EnumCallback(IDirectDrawSurface7 *surface, DDSURFACEDESC ddraw_surface1_AddRef(&surface_impl->IDirectDrawSurface_iface); ddraw_surface7_Release(surface); + /* FIXME: Check surface_test.dwSize */ return info->callback(&surface_impl->IDirectDrawSurface_iface, (DDSURFACEDESC *)surface_desc, info->context); } @@ -2863,7 +2872,7 @@ static HRESULT WINAPI ddraw_surface3_GetSurfaceDesc(IDirectDrawSurface3 *iface, } EnterCriticalSection(&ddraw_cs); - DD_STRUCT_COPY_BYSIZE(surface_desc, (DDSURFACEDESC *)&This->surface_desc); + DDSD2_to_DDSD(&This->surface_desc, surface_desc); TRACE("Returning surface desc:\n"); if (TRACE_ON(ddraw)) { diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index ca63461..962a62f 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -1219,3 +1219,38 @@ void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) * DDSD_TEXTURESTAGE, DDSD_FVF, DDSD_SRCVBHANDLE, */ } + +/* Note that this function writes the full sizeof(DDSURFACEDESC) size, don't use it + * for writing into application-provided DDSURFACEDESC structures if the size may + * be different */ +void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) +{ + memset(out, 0, sizeof(*out)); + out->dwSize = sizeof(*out); + out->dwFlags = in->dwFlags; + if (in->dwFlags & DDSD_WIDTH) out->dwWidth = in->dwWidth; + if (in->dwFlags & DDSD_HEIGHT) out->dwHeight = in->dwHeight; + if (in->dwFlags & DDSD_PIXELFORMAT) out->ddpfPixelFormat = in->u4.ddpfPixelFormat; + /* ddsCaps is read even without DDSD_CAPS set. See dsurface:no_ddsd_caps_test */ + out->ddsCaps.dwCaps = in->ddsCaps.dwCaps; + if (in->dwFlags & DDSD_PITCH) out->u1.lPitch = in->u1.lPitch; + if (in->dwFlags & DDSD_BACKBUFFERCOUNT) out->dwBackBufferCount = in->dwBackBufferCount; + if (in->dwFlags & DDSD_ZBUFFERBITDEPTH) out->u2.dwZBufferBitDepth = in->u2.dwMipMapCount; /* same union */ + if (in->dwFlags & DDSD_ALPHABITDEPTH) out->dwAlphaBitDepth = in->dwAlphaBitDepth; + /* DDraw(native, and wine) does not set the DDSD_LPSURFACE, so always copy */ + out->lpSurface = in->lpSurface; + if (in->dwFlags & DDSD_CKDESTOVERLAY) out->ddckCKDestOverlay = in->u3.ddckCKDestOverlay; + if (in->dwFlags & DDSD_CKDESTBLT) out->ddckCKDestBlt = in->ddckCKDestBlt; + if (in->dwFlags & DDSD_CKSRCOVERLAY) out->ddckCKSrcOverlay = in->ddckCKSrcOverlay; + if (in->dwFlags & DDSD_CKSRCBLT) out->ddckCKSrcBlt = in->ddckCKSrcBlt; + if (in->dwFlags & DDSD_MIPMAPCOUNT) out->u2.dwMipMapCount = in->u2.dwMipMapCount; + if (in->dwFlags & DDSD_REFRESHRATE) out->u2.dwRefreshRate = in->u2.dwRefreshRate; + if (in->dwFlags & DDSD_LINEARSIZE) out->u1.dwLinearSize = in->u1.dwLinearSize; + /* Does not exist in DDSURFACEDESC: + * DDSD_TEXTURESTAGE, DDSD_FVF, DDSD_SRCVBHANDLE, + */ + if (in->dwFlags & DDSD_TEXTURESTAGE) WARN("Does not exist in DDSURFACEDESC: DDSD_TEXTURESTAGE\n"); + if (in->dwFlags & DDSD_FVF) WARN("Does not exist in DDSURFACEDESC: DDSD_FVF\n"); + if (in->dwFlags & DDSD_SRCVBHANDLE) WARN("Does not exist in DDSURFACEDESC: DDSD_SRCVBHANDLE\n"); + out->dwFlags &= ~(DDSD_TEXTURESTAGE | DDSD_FVF | DDSD_SRCVBHANDLE); +}

1 0

Stefan Dösinger : ddraw: Convert dwZBufferBitDepth into a DDPIXELFORMAT.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 42b7ad4fd49587e4b97c055dd11a3eb57c1c9ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42b7ad4fd49587e4b97c055dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 30 12:45:41 2011 +0200 ddraw: Convert dwZBufferBitDepth into a DDPIXELFORMAT. --- dlls/ddraw/ddraw.c | 26 +------ dlls/ddraw/tests/dsurface.c | 183 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/utils.c | 16 +++- 3 files changed, 195 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42b7ad4fd49587e4b97c0…

1 0

Stefan Dösinger : ddraw: Introduce a function to convert a DDSURFACEDESC to a DDSURFACEDESC2.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 76fecde8fb2d335e4855bec6d36ffe16cbed04f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fecde8fb2d335e4855bec6d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 26 14:22:40 2011 +0200 ddraw: Introduce a function to convert a DDSURFACEDESC to a DDSURFACEDESC2. --- dlls/ddraw/ddraw.c | 38 ++++++++++++++++++++++++++++---------- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 16 ++++++++++++---- dlls/ddraw/utils.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76fecde8fb2d335e4855b…

1 0

Stefan Dösinger : ddraw: Show that ddraw reads ddsCaps without DDSD_CAPS set.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 167b65ca5e6ca94b9bdfb7b0913af7df54e90ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167b65ca5e6ca94b9bdfb7b09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 30 11:58:07 2011 +0200 ddraw: Show that ddraw reads ddsCaps without DDSD_CAPS set. --- dlls/ddraw/tests/dsurface.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 1bbf5cc..a257878 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3801,6 +3801,50 @@ static void CreateSurfaceBadCapsSizeTest(void) IDirectDraw7_Release(dd7); } +static void reset_ddsd(DDSURFACEDESC *ddsd) +{ + memset(ddsd, 0, sizeof(*ddsd)); + ddsd->dwSize = sizeof(*ddsd); +} + +static void no_ddsd_caps_test(void) +{ + DDSURFACEDESC ddsd; + HRESULT hr; + IDirectDrawSurface *surface; + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); + reset_ddsd(&ddsd); + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &ddsd); + IDirectDrawSurface_Release(surface); + ok(ddsd.dwFlags & DDSD_CAPS, "DDSD_CAPS is not set\n"); + ok(ddsd.ddsCaps.dwCaps & DDSCAPS_OFFSCREENPLAIN, "DDSCAPS_OFFSCREENPLAIN is not set\n"); + + reset_ddsd(&ddsd); + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); + reset_ddsd(&ddsd); + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &ddsd); + IDirectDrawSurface_Release(surface); + ok(ddsd.dwFlags & DDSD_CAPS, "DDSD_CAPS is not set\n"); + ok(ddsd.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE, "DDSCAPS_OFFSCREENPLAIN is not set\n"); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw_CreateSurface returned %#x, expected DDERR_INVALIDCAPS.\n", hr); +} + START_TEST(dsurface) { HRESULT ret; @@ -3857,5 +3901,6 @@ START_TEST(dsurface) BackBufferCreateSurfaceTest(); BackBufferAttachmentFlipTest(); CreateSurfaceBadCapsSizeTest(); + no_ddsd_caps_test(); ReleaseDirectDraw(); }

1 0

Francois Gouget : hhctrl.ocx: Don't show unimplemented buttons.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: c103d6d2070f9d361104f8585c2e9e4e433049e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c103d6d2070f9d361104f8585… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 31 16:53:54 2011 +0200 hhctrl.ocx: Don't show unimplemented buttons. --- dlls/hhctrl.ocx/help.c | 23 +++++--------- dlls/hhctrl.ocx/hhctrl.rc | 14 -------- po/ar.po | 70 ++++-------------------------------------- po/bg.po | 74 +++++--------------------------------------- po/ca.po | 70 ++++-------------------------------------- po/cs.po | 70 ++++-------------------------------------- po/da.po | 70 ++++-------------------------------------- po/de.po | 70 ++++-------------------------------------- po/el.po | 70 ++++-------------------------------------- po/en.po | 70 ++++-------------------------------------- po/en_US.po | 70 ++++-------------------------------------- po/eo.po | 70 ++++-------------------------------------- po/es.po | 70 ++++-------------------------------------- po/fa.po | 70 ++++-------------------------------------- po/fi.po | 70 ++++-------------------------------------- po/fr.po | 70 ++++-------------------------------------- po/he.po | 70 ++++-------------------------------------- po/hi.po | 70 ++++-------------------------------------- po/hu.po | 70 ++++-------------------------------------- po/it.po | 70 ++++-------------------------------------- po/ja.po | 70 ++++-------------------------------------- po/ko.po | 70 ++++-------------------------------------- po/lt.po | 70 ++++-------------------------------------- po/ml.po | 70 ++++-------------------------------------- po/nb_NO.po | 70 ++++-------------------------------------- po/nl.po | 70 ++++-------------------------------------- po/or.po | 70 ++++-------------------------------------- po/pa.po | 70 ++++-------------------------------------- po/pl.po | 70 ++++-------------------------------------- po/pt_BR.po | 70 ++++-------------------------------------- po/pt_PT.po | 70 ++++-------------------------------------- po/rm.po | 70 ++++-------------------------------------- po/ro.po | 70 ++++-------------------------------------- po/ru.po | 70 ++++-------------------------------------- po/sk.po | 70 ++++-------------------------------------- po/sl.po | 70 ++++-------------------------------------- po/sr_RS(a)cyrillic.po | 70 ++++-------------------------------------- po/sr_RS(a)latin.po | 70 ++++-------------------------------------- po/sv.po | 70 ++++-------------------------------------- po/te.po | 70 ++++-------------------------------------- po/th.po | 70 ++++-------------------------------------- po/tr.po | 70 ++++-------------------------------------- po/uk.po | 70 ++++-------------------------------------- po/wa.po | 70 ++++-------------------------------------- po/wine.pot | 70 ++++-------------------------------------- po/zh_CN.po | 70 ++++-------------------------------------- po/zh_TW.po | 70 ++++-------------------------------------- 47 files changed, 325 insertions(+), 2866 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c103d6d2070f9d361104f…

1 0

Francois Gouget : po: Fix some typography issues in the Bulgarian translation.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: ea82376dad4e15623960efa8ba329a79a2486581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea82376dad4e15623960efa8b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 31 16:01:20 2011 +0200 po: Fix some typography issues in the Bulgarian translation. --- po/bg.po | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/po/bg.po b/po/bg.po index 8acb202..a2259c4 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2228,7 +2228,7 @@ msgstr "&Отметки" #: ieframe.rc:52 regedit.rc:73 msgid "&Add to Favorites..." -msgstr "&Добави към отметките" +msgstr "&Добави към отметките..." #: ieframe.rc:55 shell32.rc:125 clock.rc:41 notepad.rc:57 oleview.rc:69 #: progman.rc:52 regedit.rc:76 taskmgr.rc:87 winefile.rc:85 winemine.rc:48 @@ -5611,7 +5611,7 @@ msgstr "източника за инсталация на функционалн #: msi.rc:59 msgid "network drive for feature missing" -msgstr "мрежовото устройства нужно за функционалността липсва " +msgstr "мрежовото устройства нужно за функционалността липсва" #: msi.rc:60 msgid "feature from:" @@ -6741,7 +6741,7 @@ msgstr "Папката не може да бъде създадена: Дост #: shell32.rc:167 msgid "Error during creation of a new folder" -msgstr "Грешка при създаването на нова папка." +msgstr "Грешка при създаването на нова папка" #: shell32.rc:168 msgid "Confirm file deletion" @@ -8620,7 +8620,7 @@ msgid "" "You did not enter any text.\n" "Please type something and try again." msgstr "" -"Не сте въвели никакъв текст. \n" +"Не сте въвели никакъв текст.\n" "Напишете нещо и опитайте отново." #: notepad.rc:83 @@ -8629,8 +8629,7 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"Файлът '%s'\n" -"не съществува\n" +"Файлът '%s' не съществува.\n" "\n" " Искате ли да създадете нов файл?" @@ -8640,8 +8639,7 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"Файлът '%s'\n" -"е бил променен\n" +"Файлът '%s' е бил променен.\n" "\n" " Искате ли да съхраните промените?" @@ -9216,7 +9214,7 @@ msgstr "&Разделител" #: regedit.rc:74 msgid "&Remove Favorite..." -msgstr "&Премахни отметка" +msgstr "&Премахни отметка..." #: regedit.rc:79 msgid "&About Registry Editor" @@ -9306,11 +9304,11 @@ msgstr "Излиза от редактора на системния регис #: regedit.rc:161 msgid "Adds keys to the favorites list" -msgstr "Добавя ключове към списъка с отметките..." +msgstr "Добавя ключове към списъка с отметките" #: regedit.rc:162 msgid "Removes keys from the favorites list" -msgstr "Премахва ключове от списъка с отметките..." +msgstr "Премахва ключове от списъка с отметките" #: regedit.rc:163 msgid "Shows or hides the status bar" @@ -10203,7 +10201,7 @@ msgid "" "Changing the load order of this library is not recommended.\n" "Are you sure you want to do this?" msgstr "" -"Промяната на реда на зареждане не е препоръчителна. Сигурни ли сте, че " +"Промяната на реда на зареждане не е препоръчителна.\nСигурни ли сте, че " "искате да направите това?" #: winecfg.rc:61 @@ -10874,7 +10872,7 @@ msgstr "Винаги от&горе" #: winhlp32.rc:56 msgid "&About Wine Help" -msgstr "&Информация..." +msgstr "&Информация" #: winhlp32.rc:64 #, fuzzy

1 0

Jacek Caban : msi: Use struct instead of interface in object declarations.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 81031c532eac726e95e6cf506c8d7de9f0bf3c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81031c532eac726e95e6cf506… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 16:15:12 2011 +0200 msi: Use struct instead of interface in object declarations. --- dlls/msi/automation.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index d6ef5c9..1be56b1 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -47,9 +47,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); * called from AutomationObject::Invoke, and pass this function to create_automation_object. */ -typedef interface AutomationObject AutomationObject; +typedef struct AutomationObject AutomationObject; -interface AutomationObject { +struct AutomationObject { /* * VTables - We provide IDispatch, IProvideClassInfo, IProvideClassInfo2, IProvideMultipleClassInfo */ @@ -87,9 +87,7 @@ interface AutomationObject { * ListEnumerator - IEnumVARIANT implementation for MSI automation lists. */ -typedef interface ListEnumerator ListEnumerator; - -interface ListEnumerator { +typedef struct { /* VTables */ const IEnumVARIANTVtbl *lpVtbl; @@ -99,7 +97,7 @@ interface ListEnumerator { /* Current position and pointer to AutomationObject that stores actual data */ ULONG ulPos; AutomationObject *pObj; -}; +} ListEnumerator; /* * Structures for additional data required by specific automation objects

1 0