wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Stefan Dösinger : ddraw: Check the alignment, not the size.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: d6f17d686debb491d7213f973453659d6ffa76d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f17d686debb491d7213f973… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 17:18:09 2011 +0200 ddraw: Check the alignment, not the size. --- dlls/ddraw/tests/overlay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 5053efb..9660d74 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -215,7 +215,7 @@ static void yv12_test(void) ok(desc.dwWidth == 256 && desc.dwHeight == 256, "Expected size 256x256, got %ux%u\n", desc.dwWidth, desc.dwHeight); /* The overlay pitch seems to have 256 byte alignment */ - ok(U1(desc).lPitch == 256, "Unexpected pitch %u, expected 256\n", U1(desc).lPitch); + ok((U1(desc).lPitch & 0xff) == 0, "Expected 256 byte aligned pitch, got %u\n", U1(desc).lPitch); hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr);

1 0

Stefan Dösinger : ddraw: Add some NULL pointer tests.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 8e79a7e6644fd6f1e0cfeb8b826e683d171d723a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e79a7e6644fd6f1e0cfeb8b8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 3 21:06:11 2011 +0200 ddraw: Add some NULL pointer tests. --- dlls/ddraw/ddraw.c | 36 ++++++++++++------------ dlls/ddraw/surface.c | 26 +++++++++++------ dlls/ddraw/tests/ddrawmodes.c | 4 ++ dlls/ddraw/tests/dsurface.c | 62 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e79a7e6644fd6f1e0cfe…

1 0

Stefan Dösinger : ddraw: Remove crashing tests.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 252bead28027331c30887b331f55de2245d5d607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=252bead28027331c30887b331… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 7 00:12:35 2011 +0200 ddraw: Remove crashing tests. --- dlls/ddraw/tests/ddrawmodes.c | 36 ------------------------------------ 1 files changed, 0 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 61f07fe..81ff43e 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -104,13 +104,6 @@ static void releasedirectdraw(void) } } -static BOOL WINAPI crash_callbackA(GUID *lpGUID, LPSTR lpDriverDescription, - LPSTR lpDriverName, LPVOID lpContext) -{ - *(volatile char*)0 = 2; - return TRUE; -} - static BOOL WINAPI test_nullcontext_callbackA(GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext) { @@ -147,19 +140,6 @@ static void test_DirectDrawEnumerateA(void) ret = pDirectDrawEnumerateA(NULL, NULL); ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - /* Test with invalid callback parameter. */ - ret = pDirectDrawEnumerateA((LPDDENUMCALLBACKA)0xdeadbeef, NULL); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - - if (pDirectDrawEnumerateExA) - { - /* Test with callback that crashes. */ - ret = pDirectDrawEnumerateA(crash_callbackA, NULL); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - } - else - win_skip("Test would crash on older ddraw\n"); - /* Test with valid callback parameter and NULL context parameter. */ trace("Calling DirectDrawEnumerateA with test_nullcontext_callbackA callback and NULL context.\n"); ret = pDirectDrawEnumerateA(test_nullcontext_callbackA, NULL); @@ -207,14 +187,6 @@ static void test_DirectDrawEnumerateW(void) ok(ret == DDERR_UNSUPPORTED, "Expected DDERR_UNSUPPORTED, got %d\n", ret); } -static BOOL WINAPI crash_callbackExA(GUID *lpGUID, LPSTR lpDriverDescription, - LPSTR lpDriverName, LPVOID lpContext, - HMONITOR hm) -{ - *(volatile char*)0 = 2; - return TRUE; -} - static BOOL WINAPI test_nullcontext_callbackExA(GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm) @@ -253,14 +225,6 @@ static void test_DirectDrawEnumerateExA(void) ret = pDirectDrawEnumerateExA(NULL, NULL, 0); ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - /* Test with invalid callback parameter. */ - ret = pDirectDrawEnumerateExA((LPDDENUMCALLBACKEXA)0xdeadbeef, NULL, 0); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - - /* Test with callback that crashes. */ - ret = pDirectDrawEnumerateExA(crash_callbackExA, NULL, 0); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - /* Test with valid callback parameter and invalid flags */ ret = pDirectDrawEnumerateExA(test_nullcontext_callbackExA, NULL, ~0); ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_render_state() const.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 33f087c95da2676ceb357c7cc6025538ae380284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f087c95da2676ceb357c7cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 6 19:19:52 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_render_state() 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 16faace..4a8b5c6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2500,7 +2500,7 @@ HRESULT CDECL wined3d_device_set_render_state(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_render_state(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_render_state(const struct wined3d_device *device, WINED3DRENDERSTATETYPE state, DWORD *value) { TRACE("device %p, state %s (%#x), value %p.\n", device, debug_d3drenderstate(state), state, value); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 23e88d1..2039398 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2239,7 +2239,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_i(struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); HRESULT __cdecl wined3d_device_get_raster_status(struct wined3d_device *device, UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status); -HRESULT __cdecl wined3d_device_get_render_state(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, WINED3DRENDERSTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface **render_target);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_viewport() const.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: b55dcfd35af1415544645d529b0ddfe4b39337ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55dcfd35af1415544645d529… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 6 19:19:51 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_viewport() 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 2660ee8..16faace 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2465,7 +2465,7 @@ HRESULT CDECL wined3d_device_set_viewport(struct wined3d_device *device, const W return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_viewport(struct wined3d_device *device, WINED3DVIEWPORT *viewport) +HRESULT CDECL wined3d_device_get_viewport(const struct wined3d_device *device, WINED3DVIEWPORT *viewport) { TRACE("device %p, viewport %p.\n", device, viewport); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c9f9edf..23e88d1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2265,7 +2265,7 @@ HRESULT __cdecl wined3d_device_get_transform(const struct wined3d_device *device HRESULT __cdecl wined3d_device_get_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration **declaration); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_get_viewport(struct wined3d_device *device, WINED3DVIEWPORT *viewport); +HRESULT __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, WINED3DVIEWPORT *viewport); HRESULT __cdecl wined3d_device_get_vs_consts_b(struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_vs_consts_f(struct wined3d_device *device,

1 0

Henri Verbeet : ddraw: Set the swap effect to WINED3DSWAPEFFECT_COPY in ddraw_create_gdi_swapchain ().
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 5824551d76770ad566734e6646168cbe760757bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5824551d76770ad566734e664… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 6 19:19:50 2011 +0200 ddraw: Set the swap effect to WINED3DSWAPEFFECT_COPY in ddraw_create_gdi_swapchain(). The actual swapchain implementation ignores the swap effect and always does a copy anyway, but this makes it consistent with ddraw_attach_d3d_device(). --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b44ac9f..038ad18 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2817,7 +2817,7 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur presentation_parameters.BackBufferFormat = PixelFormat_DD2WineD3D(&primary->surface_desc.u4.ddpfPixelFormat); presentation_parameters.BackBufferCount = (primary->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) ? primary->surface_desc.dwBackBufferCount : 0; - presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_FLIP; + presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_COPY; presentation_parameters.hDeviceWindow = window; presentation_parameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN);

1 0

Henri Verbeet : ddraw: Only explicitly initialize non-zero fields in ddraw_create_gdi_swapchain() .
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 582767ce456edcd989661a6fd71b54807ea87610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582767ce456edcd989661a6fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 6 19:19:49 2011 +0200 ddraw: Only explicitly initialize non-zero fields in ddraw_create_gdi_swapchain(). Update ddraw_attach_d3d_device() for consistency. --- dlls/ddraw/ddraw.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f1d7b37..b44ac9f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2761,6 +2761,8 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac /* Store the future Render Target surface */ ddraw->d3d_target = primary; + memset(&localParameters, 0, sizeof(localParameters)); + /* Use the surface description for the device parameters, not the device * settings. The application might render to an offscreen surface. */ localParameters.BackBufferWidth = primary->surface_desc.dwWidth; @@ -2768,17 +2770,9 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac localParameters.BackBufferFormat = PixelFormat_DD2WineD3D(&primary->surface_desc.u4.ddpfPixelFormat); localParameters.BackBufferCount = (primary->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) ? primary->surface_desc.dwBackBufferCount : 0; - localParameters.MultiSampleType = WINED3DMULTISAMPLE_NONE; - localParameters.MultiSampleQuality = 0; localParameters.SwapEffect = WINED3DSWAPEFFECT_COPY; localParameters.hDeviceWindow = window; localParameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); - localParameters.EnableAutoDepthStencil = FALSE; - localParameters.AutoDepthStencilFormat = WINED3DFMT_UNKNOWN; - localParameters.Flags = 0; - localParameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; - localParameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; - localParameters.AutoRestoreDisplayMode = FALSE; /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ @@ -2823,17 +2817,9 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur presentation_parameters.BackBufferFormat = PixelFormat_DD2WineD3D(&primary->surface_desc.u4.ddpfPixelFormat); presentation_parameters.BackBufferCount = (primary->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) ? primary->surface_desc.dwBackBufferCount : 0; - presentation_parameters.MultiSampleType = WINED3DMULTISAMPLE_NONE; - presentation_parameters.MultiSampleQuality = 0; presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_FLIP; presentation_parameters.hDeviceWindow = window; presentation_parameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); - presentation_parameters.EnableAutoDepthStencil = FALSE; /* Not on GDI swapchains */ - presentation_parameters.AutoDepthStencilFormat = 0; - presentation_parameters.Flags = 0; - presentation_parameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; - presentation_parameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; - presentation_parameters.AutoRestoreDisplayMode = FALSE; ddraw->d3d_target = primary; hr = wined3d_device_init_gdi(ddraw->wined3d_device, &presentation_parameters);

1 0

Henri Verbeet : wined3d: Implement wined3d_surface_flip() as a blit.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 79c438b2f2d3db5edd066f124c6b1b1d7564de8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c438b2f2d3db5edd066f124… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 6 19:19:48 2011 +0200 wined3d: Implement wined3d_surface_flip() as a blit. This allows us to actually take the "override" parameter into account. Plain back -> front flips will be detected in wined3d_surface_flip() and will still be handled by wined3d_swapchain_present(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 706c70a..633517d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3807,7 +3807,7 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINED3D_OK; } - return wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); + return wined3d_surface_blt(surface, NULL, override, NULL, 0, NULL, WINED3DTEXF_POINT); } /* Do not call while under the GL lock. */

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: f74a897f0eb47bea874b9247a24ad0dd61aa3507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74a897f0eb47bea874b9247a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 6 17:34:42 2011 +0200 po: Update German translation. --- po/de.po | 36 ++++++------------------------------ 1 files changed, 6 insertions(+), 30 deletions(-) diff --git a/po/de.po b/po/de.po index ddc271f..0a68e4d 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: 2011-09-01 18:05+0200\n" +"PO-Revision-Date: 2011-09-06 08:07+0200\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -688,7 +688,6 @@ msgid "Prefer Signed Data" msgstr "Signierte Daten bevorzugen" #: crypt32.rc:53 cryptdlg.rc:31 -#, fuzzy msgctxt "Certification Practice Statement" msgid "CPS" msgstr "CPS" @@ -1226,7 +1225,6 @@ msgid "Subject Type=" msgstr "Subject Typ=" #: crypt32.rc:195 -#, fuzzy msgctxt "Certificate Authority" msgid "CA" msgstr "Zertifikationsautorität" @@ -1257,7 +1255,6 @@ msgid "Access Method=" msgstr "Zugriffsmethode=" #: crypt32.rc:202 -#, fuzzy msgctxt "Online Certificate Status Protocol" msgid "OCSP" msgstr "OCSP" @@ -2354,9 +2351,8 @@ msgid "URI to be encoded contains invalid characters" msgstr "Zu verschlüsselnde URI enthält ungültige Zeichen" #: jscript.rc:48 -#, fuzzy msgid "URI to be decoded is incorrect" -msgstr "Zu verschlüsselnde URI enthält ungültige Zeichen" +msgstr "Zu entschlüsselnde URI ist ungültig" #: jscript.rc:50 msgid "Array length must be a finite positive integer" @@ -3853,9 +3849,8 @@ msgid "Perform operation even when nothing changed\n" msgstr "Operation durchführen, auch wenn sich nichts ändert\n" #: winerror.mc:1896 -#, fuzzy msgid "The user profile is invalid\n" -msgstr "Das Benutzerprofil ist ungültig." +msgstr "Das Benutzerprofil ist ungültig\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server\n" @@ -4518,9 +4513,8 @@ msgid "Installer service failed.\n" msgstr "Installer Dienst gescheitert.\n" #: winerror.mc:2731 -#, fuzzy msgid "Installation aborted by user\n" -msgstr "Setup-Programme" +msgstr "Installation von Benutzer abgebrochen\n" #: winerror.mc:2736 msgid "Installation failure\n" @@ -5922,13 +5916,8 @@ msgid "Set as &Desktop Item" msgstr "Als Desktopelement einrichten..." #: shdoclc.rc:46 shdoclc.rc:95 shdoclc.rc:117 user32.rc:62 -#, fuzzy msgid "Select &All" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Alles &auswählen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Alles markieren" +msgstr "&Alles markieren" #: shdoclc.rc:47 shdoclc.rc:79 shdoclc.rc:92 shdoclc.rc:132 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:59 wineconsole.rc:30 wordpad.rc:103 @@ -6037,13 +6026,8 @@ msgid "&Delete" msgstr "&Löschen" #: shdoclc.rc:100 shell32.rc:94 -#, fuzzy msgid "&Select" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Auswählen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Aus&wählen" +msgstr "Aus&wählen" #: shdoclc.rc:102 msgid "&Cell" @@ -6769,19 +6753,16 @@ msgid "%ld bytes" msgstr "%ld Bytes" #: shlwapi.rc:28 -#, fuzzy msgctxt "time unit: hours" msgid " hr" msgstr " Std" #: shlwapi.rc:29 -#, fuzzy msgctxt "time unit: minutes" msgid " min" msgstr " Min" #: shlwapi.rc:30 -#, fuzzy msgctxt "time unit: seconds" msgid " sec" msgstr " Sek" @@ -9951,12 +9932,10 @@ msgid "&Realtime" msgstr "&Echtzeit" #: taskmgr.rc:160 -#, fuzzy msgid "&Above Normal" msgstr "&Höher als Normal" #: taskmgr.rc:164 -#, fuzzy msgid "&Below Normal" msgstr "N&iedriger als Normal" @@ -11333,13 +11312,11 @@ msgid "Pages" msgstr "Seiten" #: wordpad.rc:172 -#, fuzzy msgctxt "unit: centimeter" msgid "cm" msgstr "cm" #: wordpad.rc:173 -#, fuzzy msgctxt "unit: inch" msgid "in" msgstr "in" @@ -11349,7 +11326,6 @@ msgid "inch" msgstr "Zoll" #: wordpad.rc:175 -#, fuzzy msgctxt "unit: point" msgid "pt" msgstr "pt"

1 0

Octavian Voicu : ntdll: Fix two buffer overflow conditions in RtlDosPathNameToNtPathName_U.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: ce60eb845968d80e693566dd9bbf284fed31bc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce60eb845968d80e693566dd9… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Tue Sep 6 15:23:42 2011 +0300 ntdll: Fix two buffer overflow conditions in RtlDosPathNameToNtPathName_U. --- dlls/ntdll/path.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 3207720..6138fa8 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -383,8 +383,14 @@ BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, if (!(ptr = RtlAllocateHeap(GetProcessHeap(), 0, sz))) return FALSE; sz = RtlGetFullPathName_U(dos_path, sz, ptr, file_part); } + sz += (1 /* NUL */ + 4 /* unc\ */ + 4 /* \??\ */) * sizeof(WCHAR); + if (sz > MAXWORD) + { + if (ptr != local) RtlFreeHeap(GetProcessHeap(), 0, ptr); + return FALSE; + } - ntpath->MaximumLength = sz + (4 /* unc\ */ + 4 /* \??\ */) * sizeof(WCHAR); + ntpath->MaximumLength = sz; ntpath->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, ntpath->MaximumLength); if (!ntpath->Buffer) {

1 0

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 September 2011