October 2011 - Wine-Commits

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_gamma_ramp() const.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: da32d34439f4a58cbff1ecdbc9f3f8de184538d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da32d34439f4a58cbff1ecdbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 19 22:03:14 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_gamma_ramp() const. --- dlls/wined3d/device.c | 3 ++- include/wine/wined3d.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cfd8ced..67e50b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5838,7 +5838,8 @@ void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, } } -void CDECL wined3d_device_get_gamma_ramp(struct wined3d_device *device, UINT swapchain_idx, WINED3DGAMMARAMP *ramp) +void CDECL wined3d_device_get_gamma_ramp(const struct wined3d_device *device, + UINT swapchain_idx, WINED3DGAMMARAMP *ramp) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f16530c..97df749 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2218,7 +2218,8 @@ HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *dev UINT swapchain_idx, WINED3DDISPLAYMODE *mode); HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_surface *dst_surface); -void __cdecl wined3d_device_get_gamma_ramp(struct wined3d_device *device, UINT swapchain_idx, WINED3DGAMMARAMP *ramp); +void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, + UINT swapchain_idx, WINED3DGAMMARAMP *ramp); HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, struct wined3d_buffer **index_buffer); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, WINED3DLIGHT *light);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_set_gamma_ramp() const.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 23ee1a451b954fb70671023a9ff82090ddf266bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ee1a451b954fb70671023a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 19 22:03:13 2011 +0200 wined3d: Make the device parameter to wined3d_device_set_gamma_ramp() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 26b4d27..cfd8ced 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5823,7 +5823,7 @@ HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device return WINED3D_OK; } -void CDECL wined3d_device_set_gamma_ramp(struct wined3d_device *device, +void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a94f5d0..f16530c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2295,7 +2295,7 @@ HRESULT __cdecl wined3d_device_set_depth_stencil(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); HRESULT __cdecl wined3d_device_set_display_mode(struct wined3d_device *device, UINT swapchain_idx, const WINED3DDISPLAYMODE *mode); -void __cdecl wined3d_device_set_gamma_ramp(struct wined3d_device *device, +void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const WINED3DGAMMARAMP *ramp); HRESULT __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id);

1 0

Andrew Eikum : dsound: Don't claim to support hardware buffers.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 9b15c17376a6943af05f8d118386d87c6ac3829b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b15c17376a6943af05f8d118… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 19 15:07:18 2011 -0500 dsound: Don't claim to support hardware buffers. --- dlls/dsound/dsound.c | 10 ++++ dlls/dsound/tests/dsound.c | 111 +++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/tests/dsound8.c | 110 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 231 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b15c17376a6943af05f8…

1 0

Henri Verbeet : wined3d: Allow loading multisampled surfaces into sysmem.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 82f067f5cdf00b8b9cf61cf775900ac99a3f0877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f067f5cdf00b8b9cf61cf77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 19 22:03:10 2011 +0200 wined3d: Allow loading multisampled surfaces into sysmem. --- dlls/wined3d/surface.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1f1dc8f..54cacbd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5789,6 +5789,9 @@ static void surface_load_sysmem(struct wined3d_surface *surface, { surface_prepare_system_memory(surface); + if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED)) + surface_load_location(surface, SFLAG_INTEXTURE, NULL); + /* Download the surface to system memory. */ if (surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) { @@ -5945,6 +5948,22 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, return WINED3D_OK; } + if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED) + && (surface->resource.format->flags & attach_flags) == attach_flags + && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, + NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) + { + DWORD src_location = surface->flags & SFLAG_INRB_RESOLVED ? SFLAG_INRB_RESOLVED : SFLAG_INRB_MULTISAMPLE; + DWORD dst_location = srgb ? SFLAG_INSRGBTEX : SFLAG_INTEXTURE; + RECT rect = {0, 0, surface->resource.width, surface->resource.height}; + + surface_blt_fbo(device, WINED3DTEXF_POINT, surface, src_location, + &rect, surface, dst_location, &rect); + + return WINED3D_OK; + } + /* Upload from system memory */ d3dfmt_get_conv(surface, TRUE /* We need color keying */,

1 0

Henri Verbeet : d3d8/tests: Add a small test for multisampled CopyRects().
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: fd1afd24f4af20646ce0f3a7ac2064e8e49b1e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1afd24f4af20646ce0f3a7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 19 22:03:11 2011 +0200 d3d8/tests: Add a small test for multisampled CopyRects(). --- dlls/d3d8/tests/visual.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e90553a..c221d47 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2228,6 +2228,74 @@ static void shadow_test(IDirect3DDevice8 *device) IDirect3D8_Release(d3d8); } +static void multisample_copy_rects_test(IDirect3DDevice8 *device) +{ + IDirect3DSurface8 *original_ds, *original_rt, *rt, *readback; + RECT src_rect = {64, 64, 128, 128}; + POINT dst_point = {96, 96}; + D3DLOCKED_RECT locked_rect; + IDirect3D8 *d3d8; + D3DCOLOR color; + HRESULT hr; + + hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); + ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceMultiSampleType(d3d8, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES); + IDirect3D8_Release(d3d8); + if (FAILED(hr)) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled CopyRects test.\n"); + return; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_2_SAMPLES, FALSE, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateImageSurface(device, 256, 256, D3DFMT_A8R8G8B8, &readback); + ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetRenderTarget(device, &original_rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &original_ds); + ok(SUCCEEDED(hr), "Failed to get depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, rt, NULL, 0, readback, NULL); + ok(SUCCEEDED(hr), "Failed to read render target back, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, rt, &src_rect, 1, readback, &dst_point); + ok(SUCCEEDED(hr), "Failed to read render target back, hr %#x.\n", hr); + + hr = IDirect3DSurface8_LockRect(readback, &locked_rect, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Failed to lock readback surface, hr %#x.\n", hr); + + color = *(DWORD *)((BYTE *)locked_rect.pBits + 31 * locked_rect.Pitch + 31 * 4); + ok(color == 0xff00ff00, "Got unexpected color 0x%08x.\n", color); + + color = *(DWORD *)((BYTE *)locked_rect.pBits + 127 * locked_rect.Pitch + 127 * 4); + ok(color == 0xffff0000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DSurface8_UnlockRect(readback); + ok(SUCCEEDED(hr), "Failed to unlock readback surface, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, original_ds); + ok(SUCCEEDED(hr), "Failed to restore original render target, hr %#x.\n", hr); + + IDirect3DSurface8_Release(original_ds); + IDirect3DSurface8_Release(original_rt); + IDirect3DSurface8_Release(readback); + IDirect3DSurface8_Release(rt); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -2306,6 +2374,7 @@ START_TEST(visual) depth_buffer2_test(device_ptr); intz_test(device_ptr); shadow_test(device_ptr); + multisample_copy_rects_test(device_ptr); cleanup: if(device_ptr) {

1 0

Aric Stewart : usp10/tests: Initialize our SCRIPT_VISATTR array.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: 8836da818e66e52b478c369850b8fea0b3688dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8836da818e66e52b478c36985… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 19 12:54:37 2011 -0500 usp10/tests: Initialize our SCRIPT_VISATTR array. Found by Valgrind and Dan Kegel. --- dlls/usp10/tests/usp10.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 180bcfb..1cf1463 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1901,6 +1901,7 @@ static void test_ScriptXtoX(void) HRESULT hr; memset(&sa, 0 , sizeof(SCRIPT_ANALYSIS)); + memset(psva, 0, sizeof(psva)); sa.fRTL = FALSE; hr = ScriptXtoCP(-1, 10, 10, pwLogClust, psva, piAdvance, &sa, &piCP, &piTrailing);

1 0

Aric Stewart : usp10: Correct some reading buffer overruns when parsing indic syllables.
by Alexandre Julliard Oct. 20, 2011

Oct. 20, 2011

Module: wine Branch: master Commit: f0c85ff83d1f014dd9efc5b4af3fa8dc0ca3a7bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c85ff83d1f014dd9efc5b4a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 19 13:11:19 2011 -0500 usp10: Correct some reading buffer overruns when parsing indic syllables. Found with help from Dan Kegel and Valgrind. --- dlls/usp10/indic.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index a25ceec..f8e5b5e 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -86,7 +86,7 @@ static INT consonant_header(LPCWSTR input, INT cChar, INT start, INT next, next++; if ((next < cChar) && lex(input[next]) == lex_Nukta) next++; - if (lex(input[next])==lex_Halant) + if ((next < cChar) && lex(input[next])==lex_Halant) { next++; if((next < cChar) && is_joiner( lex(input[next]) )) @@ -94,7 +94,7 @@ static INT consonant_header(LPCWSTR input, INT cChar, INT start, INT next, if ((next < cChar) && is_consonant( lex(input[next]) )) return next; } - else if (is_joiner( lex(input[next]) ) && lex(input[next+1])==lex_Halant) + else if ((next < cChar) && is_joiner( lex(input[next]) ) && lex(input[next+1])==lex_Halant) { next+=2; if ((next < cChar) && is_consonant( lex(input[next]) )) @@ -163,7 +163,7 @@ static INT parse_vowel_syllable(LPCWSTR input, INT cChar, INT start, else if ((next < cChar) && lex(input[next])==lex_ZWJ && is_consonant( lex(input[next+1]) )) next+=2; - if (is_matra( lex(input[next]) )) + if ((next < cChar) && is_matra( lex(input[next]) )) { while((next < cChar) && is_matra( lex(input[next]) )) next++;

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: ed6dea5d6490628a8cd1d3f32eb9aa860d779752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6dea5d6490628a8cd1d3f32… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Oct 18 20:41:41 2011 +0200 po: Update Italian translation. --- po/it.po | 32 +++++++++++--------------------- 1 files changed, 11 insertions(+), 21 deletions(-) diff --git a/po/it.po b/po/it.po index b61c588..a42544e 100644 --- a/po/it.po +++ b/po/it.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: 2011-10-18 18:05+0200\n" +"PO-Revision-Date: 2011-10-18 20:40+0200\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -6734,9 +6734,8 @@ msgid "Trash" msgstr "Cestino" #: shlwapi.rc:27 -#, fuzzy msgid "%d bytes" -msgstr "%ld byte" +msgstr "%d byte" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -11400,59 +11399,50 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Parametro '%s' non valido - Digita xcopy /? per l'aiuto\n" +msgstr "Parametro '%1' non valido - Digita xcopy /? per l'aiuto\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" msgstr "Premi Invio per iniziare a copiare\n" #: xcopy.rc:30 -#, fuzzy msgid "%1!d! file(s) would be copied\n" -msgstr "%d file saranno copiati\n" +msgstr "%1!d! file saranno copiati\n" #: xcopy.rc:31 -#, fuzzy msgid "%1!d! file(s) copied\n" -msgstr "%d file copiato/i\n" +msgstr "%1!d! file copiato/i\n" #: xcopy.rc:34 -#, fuzzy msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"'%s' è il nome di un file o una cartella\n" +"'%1' è il nome di un file o una cartella\n" "nella destinazione?\n" "(F - File, C - Cartella)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s? (Sì|No)\n" +msgstr "%1? (Sì|No)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "Sovrascrivere %s? (Sì|No|Tutti)\n" +msgstr "Sovrascrivere %1? (Sì|No|Tutti)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "La copia di '%s' in '%s' è fallita con r/c %d\n" +msgstr "La copia di '%1' in '%2' è fallita con r/c %3!d!\n" #: xcopy.rc:38 -#, fuzzy msgid "Failed to open '%1'\n" -msgstr "Impossibile aprire '%s'\n" +msgstr "Impossibile aprire '%1'\n" #: xcopy.rc:39 -#, fuzzy msgid "Failed during reading of '%1'\n" -msgstr "Errore durante la lettura di '%s'\n" +msgstr "Errore durante la lettura di '%1'\n" #: xcopy.rc:43 msgctxt "File key"

1 0

Alexandre Julliard : gdi32: Add support for pushing a font driver on the DC driver stack.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 6bb001da6fa43d2a6a0cc021d2ab8c3c897ae388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb001da6fa43d2a6a0cc021d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 18 11:43:23 2011 +0200 gdi32: Add support for pushing a font driver on the DC driver stack. --- dlls/gdi32/dc.c | 6 ++++++ dlls/gdi32/driver.c | 2 ++ dlls/gdi32/gdi_private.h | 1 + 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 74d3747..13e48fd 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -154,6 +154,12 @@ DC *alloc_dc_ptr( WORD magic ) return NULL; } dc->nulldrv.hdc = dc->hSelf; + + if (font_driver && !font_driver->pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) + { + free_dc_ptr( dc ); + return NULL; + } return dc; } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 565e0ad..d0b30be 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -49,6 +49,8 @@ struct graphics_driver static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; +const struct gdi_dc_funcs *font_driver = NULL; + static CRITICAL_SECTION driver_section; static CRITICAL_SECTION_DEBUG critsect_debug = { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0d38efe..9ee6c04 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -270,6 +270,7 @@ extern DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struc /* driver.c */ extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs dib_driver DECLSPEC_HIDDEN; +extern const struct gdi_dc_funcs *font_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Fix string comparison against non null-terminated string (Valgrind).
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 3aed056b72697f6a0ac6884331f896740093b513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aed056b72697f6a0ac688433… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 17:48:16 2011 +0200 ntdll: Fix string comparison against non null-terminated string (Valgrind). --- dlls/ntdll/actctx.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 380ce8f..8e4085d 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1823,7 +1823,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) static const WCHAR lookup_fmtW[] = {'%','s','_','%','s','_','%','s','_','%','u','.','%','u','.','*','.','*','_', '%','s','_','*','.','m','a','n','i','f','e','s','t',0}; - static const WCHAR wine_trailerW[] = {'d','e','a','d','b','e','e','f','.','m','a','n','i','f','e','s','t',0}; + static const WCHAR wine_trailerW[] = {'d','e','a','d','b','e','e','f','.','m','a','n','i','f','e','s','t'}; WCHAR *lookup, *ret = NULL; UNICODE_STRING lookup_us; @@ -1869,7 +1869,7 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) if (dir_info->NextEntryOffset) data_pos += dir_info->NextEntryOffset; else data_pos = data_len; - tmp = (WCHAR *)dir_info->FileName + (strchrW(lookup, '*') - lookup); + tmp = dir_info->FileName + (strchrW(lookup, '*') - lookup); build = atoiW(tmp); if (build < min_build) continue; tmp = strchrW(tmp, '.') + 1; @@ -1877,7 +1877,8 @@ static WCHAR *lookup_manifest_file( HANDLE dir, struct assembly_identity *ai ) if (build == min_build && revision < min_revision) continue; tmp = strchrW(tmp, '_') + 1; tmp = strchrW(tmp, '_') + 1; - if (!strcmpiW( tmp, wine_trailerW )) + if (dir_info->FileNameLength - (tmp - dir_info->FileName) * sizeof(WCHAR) == sizeof(wine_trailerW) && + !memicmpW( tmp, wine_trailerW, sizeof(wine_trailerW) / sizeof(WCHAR) )) { /* prefer a non-Wine manifest if we already have one */ /* we'll still load the builtin dll if specified through DllOverrides */

1 0