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

Dan Kegel : cmd: del /a: test deleting readonly files, with fix.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: ff1e7038b2755161d3931b019ad6f6af23970d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1e7038b2755161d3931b019… Author: Dan Kegel <dank(a)kegel.com> Date: Sun May 22 08:27:38 2011 -0700 cmd: del /a: test deleting readonly files, with fix. --- programs/cmd/builtins.c | 5 +++-- programs/cmd/tests/test_builtins.cmd | 16 ++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7a6ae72..c8baef1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -712,9 +712,10 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { /* Only proceed if ok to */ if (ok) { - /* If file is read only, and /F supplied, delete it */ + /* If file is read only, and /A:r or /F supplied, delete it */ if (fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY && - strstrW (quals, parmF) != NULL) { + ((wanted_attrs & FILE_ATTRIBUTE_READONLY) || + strstrW (quals, parmF) != NULL)) { SetFileAttributesW(fpath, fd.dwFileAttributes & ~FILE_ATTRIBUTE_READONLY); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2b117e4..62dbc6c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -78,6 +78,22 @@ if /i not foo==FOO echo if /i seems to be broken if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken +echo -----------Testing del /a----------- +del /f/q *.test > nul +echo r > r.test +attrib +r r.test +echo not-r > not-r.test + +if not exist not-r.test echo not-r.test not found before delete, bad +del /a:-r *.test +if not exist not-r.test echo not-r.test not found after delete, good + +if not exist r.test echo r.test not found before delete, bad +if exist r.test echo r.test found before delete, good +del /a:r *.test +if not exist r.test echo r.test not found after delete, good +if exist r.test echo r.test found after delete, bad + echo -----------Testing GOTO----------- if a==a goto dest1 :dest1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e4644d3..0dcd926 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -78,6 +78,10 @@ Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work +-----------Testing del /a----------- +not-r.test not found after delete, good +r.test found before delete, good +r.test not found after delete, good -----------Testing GOTO----------- goto with no leading space worked goto with a leading space worked

1 0

Jörg Höhle : include: Use SEGPTR for 16bit string pointers in MCI_*_PARMS16.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 985beb33f3827f9ee22e613d01abb941c4c54f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985beb33f3827f9ee22e613d0… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue May 24 08:35:45 2011 +0200 include: Use SEGPTR for 16bit string pointers in MCI_*_PARMS16. --- include/wine/mmsystem16.h | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h index 245c779..d30a1ba 100644 --- a/include/wine/mmsystem16.h +++ b/include/wine/mmsystem16.h @@ -513,7 +513,7 @@ typedef struct { typedef struct { DWORD dwCallback; - LPCSTR lpfilename; + SEGPTR lpfilename; } MCI_LOAD_PARMS16, *LPMCI_LOAD_PARMS16; typedef struct { @@ -582,7 +582,7 @@ typedef struct { WORD wReserved1; WORD nCmdShow; WORD wReserved2; - LPCSTR lpstrText; + SEGPTR lpstrText; } MCI_ANIM_WINDOW_PARMS16, *LPMCI_ANIM_WINDOW_PARMS16; typedef struct { @@ -605,9 +605,9 @@ typedef struct { DWORD dwCallback; MCIDEVICEID16 wDeviceID; WORD wReserved0; - LPCSTR lpstrDeviceType; - LPCSTR lpstrElementName; - LPCSTR lpstrAlias; + SEGPTR lpstrDeviceType; + SEGPTR lpstrElementName; + SEGPTR lpstrAlias; DWORD dwStyle; HWND16 hWndParent; WORD wReserved1; @@ -634,13 +634,13 @@ typedef struct { typedef struct { DWORD dwCallback; - LPCSTR lpfilename; + SEGPTR lpfilename; RECT16 rc; } MCI_OVLY_SAVE_PARMS16, *LPMCI_OVLY_SAVE_PARMS16; typedef struct { DWORD dwCallback; - LPCSTR lpfilename; + SEGPTR lpfilename; RECT16 rc; } MCI_OVLY_LOAD_PARMS16, *LPMCI_OVLY_LOAD_PARMS16; @@ -652,7 +652,7 @@ typedef struct { typedef struct { DWORD dwCallback; - LPSTR lpstrFileName; + SEGPTR lpstrFileName; RECT16 rc; } MCI_DGV_CAPTURE_PARMS16, *LPMCI_DGV_CAPTURE_PARMS16; @@ -687,18 +687,18 @@ typedef MCI_DGV_RECT_PARMS16 MCI_DGV_FREEZE_PARMS16, * LPMCI_DGV_FREEZE_PARMS16; typedef struct { DWORD dwCallback; - LPSTR lpstrReturn; + SEGPTR lpstrReturn; DWORD dwRetSize; DWORD dwItem; } MCI_DGV_INFO_PARMS16, * LPMCI_DGV_INFO_PARMS16; typedef struct { DWORD dwCallback; - LPSTR lpstrReturn; + SEGPTR lpstrReturn; DWORD dwLength; DWORD dwNumber; DWORD dwItem; - LPSTR lpstrAlgorithm; + SEGPTR lpstrAlgorithm; } MCI_DGV_LIST_PARMS16, *LPMCI_DGV_LIST_PARMS16; typedef MCI_LOAD_PARMS16 MCI_DGV_LOAD_PARMS16 , * LPMCI_DGV_LOAD_PARMS16; @@ -707,9 +707,9 @@ typedef struct { DWORD dwCallback; UINT16 wDeviceID; UINT16 wReserved0; - LPSTR lpstrDeviceType; - LPSTR lpstrElementName; - LPSTR lpstrAlias; + SEGPTR lpstrDeviceType; + SEGPTR lpstrElementName; + SEGPTR lpstrAlias; DWORD dwStyle; HWND16 hWndParent; UINT16 wReserved1; @@ -728,8 +728,8 @@ typedef MCI_DGV_RECT_PARMS16 MCI_DGV_PUT_PARMS16, * LPMCI_DGV_PUT_PARMS16; typedef struct { DWORD dwCallback; DWORD dwItem; - LPSTR lpstrName; - DWORD lpstrAlgorithm; + SEGPTR lpstrName; + SEGPTR lpstrAlgorithm; DWORD dwHandle; } MCI_DGV_QUALITY_PARMS16, *LPMCI_DGV_QUALITY_PARMS16; @@ -744,19 +744,19 @@ typedef struct { typedef struct { DWORD dwCallback; - LPSTR lpstrPath; + SEGPTR lpstrPath; DWORD dwSize; } MCI_DGV_RESERVE_PARMS16, *LPMCI_DGV_RESERVE_PARMS16A; typedef struct { DWORD dwCallback; - LPSTR lpstrFileName; + SEGPTR lpstrFileName; RECT16 rc; } MCI_DGV_RESTORE_PARMS16, *LPMCI_DGV_RESTORE_PARMS16; typedef struct { DWORD dwCallback; - LPSTR lpstrFileName; + SEGPTR lpstrFileName; RECT16 rc; } MCI_DGV_SAVE_PARMS16, *LPMCI_DGV_SAVE_PARMS16; @@ -765,8 +765,8 @@ typedef struct { DWORD dwItem; DWORD dwValue; DWORD dwOver; - LPSTR lpstrAlgorithm; - LPSTR lpstrQuality; + SEGPTR lpstrAlgorithm; + SEGPTR lpstrQuality; } MCI_DGV_SETAUDIO_PARMS16, *LPMCI_DGV_SETAUDIO_PARMS16; typedef struct { @@ -774,8 +774,8 @@ typedef struct { DWORD dwItem; DWORD dwValue; DWORD dwOver; - LPSTR lpstrAlgorithm; - LPSTR lpstrQuality; + SEGPTR lpstrAlgorithm; + SEGPTR lpstrQuality; DWORD dwSourceNumber; } MCI_DGV_SETVIDEO_PARMS16, *LPMCI_DGV_SETVIDEO_PARMS16;

1 0

Damjan Jovanovic : winemenubuilder: Extract icons from NE binaries too.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 87e9f32f6d1a790f24c97442d44078798e83c65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e9f32f6d1a790f24c97442d… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun May 22 14:09:05 2011 +0200 winemenubuilder: Extract icons from NE binaries too. --- programs/winemenubuilder/winemenubuilder.c | 289 ++++++++++++++++++++++++---- 1 files changed, 256 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87e9f32f6d1a790f24c97…

1 0

Stefan Dösinger : d3d9: AMD cards don' t clip transformed vertices.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: f6b30a17b36360f5a6a5f4d4e17625dad2e19a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b30a17b36360f5a6a5f4d4e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 23 18:08:51 2011 +0200 d3d9: AMD cards don't clip transformed vertices. --- dlls/d3d9/tests/visual.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f3ba3b4..e5c8745 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2127,6 +2127,9 @@ static void z_range_test(IDirect3DDevice9 *device) {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, D3DDECL_END() }; + + IDirect3DDevice9_GetDeviceCaps(device, &caps); + /* Does the Present clear the depth stencil? Clear the depth buffer with some value != 0, * then call Present. Then clear the color buffer to make sure it has some defined content * after the Present with D3DSWAPEFFECT_DISCARD. After that draw a plane that is somewhere cut @@ -2183,7 +2186,14 @@ static void z_range_test(IDirect3DDevice9 *device) color = getPixelColor(device, 28, 238); ok(color == 0x00ffffff, "Z range failed: Got color 0x%08x, expected 0x00ffffff.\n", color); color = getPixelColor(device, 28, 241); - ok(color == 0x00ffffff, "Z range failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_CLIPTLVERTS) + { + ok(color == 0x00ffffff, "Z range failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + } + else + { + ok(color == 0x00ffff00, "Z range failed: Got color 0x%08x, expected 0x00ffff00.\n", color); + } /* Not clipped, > z buffer clear value(0.75) */ color = getPixelColor(device, 31, 238); @@ -2209,13 +2219,19 @@ static void z_range_test(IDirect3DDevice9 *device) color = getPixelColor(device, 321, 238); ok(color == 0x00ffffff, "Z range failed: Got color 0x%08x, expected 0x00ffffff.\n", color); color = getPixelColor(device, 321, 241); - ok(color == 0x00ffffff, "Z range failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_CLIPTLVERTS) + { + ok(color == 0x00ffffff, "Z range failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + } + else + { + ok(color == 0x0000ff00, "Z range failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); /* Test the shader path */ - IDirect3DDevice9_GetDeviceCaps(device, &caps); if (caps.VertexShaderVersion < D3DVS_VERSION(1, 1)) { skip("Vertex shaders not supported\n"); goto out;

1 0

Jacek Caban : ntoskrnl.exe: Added ObReferenceObjectByHandle stub.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: ebc7abeef3b9cdc06182be9ffc74819a9a5a4e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc7abeef3b9cdc06182be9ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 24 11:53:26 2011 +0200 ntoskrnl.exe: Added ObReferenceObjectByHandle stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2543ca6..3f86cdc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1414,6 +1414,21 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE obj, ACCESS_MASK access, return STATUS_NOT_IMPLEMENTED; } + /*********************************************************************** + * ObReferenceObjectByName (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, + ULONG Attributes, + ACCESS_STATE *AccessState, + ACCESS_MASK DesiredAccess, + POBJECT_TYPE ObjectType, + KPROCESSOR_MODE AccessMode, + void *ParseContext, + void **Object) +{ + FIXME("stub\n"); + return STATUS_NOT_IMPLEMENTED; +} /*********************************************************************** * ObfDereferenceObject (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3c059b6..1456fbe 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -810,7 +810,7 @@ @ stub ObQueryNameString @ stub ObQueryObjectAuditingByHandle @ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) -@ stub ObReferenceObjectByName +@ stdcall ObReferenceObjectByName(ptr long ptr long ptr long ptr ptr) @ stub ObReferenceObjectByPointer @ stub ObReferenceSecurityDescriptor @ stub ObReleaseObjectSecurity

1 0

Stefan Dösinger : d3d9: AMD drivers return D3D_OK when reading data from an unfinished query.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 9e19cb076fb525b608e8b6b3d3c6b4d7bde4c25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e19cb076fb525b608e8b6b3d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 23 17:52:48 2011 +0200 d3d9: AMD drivers return D3D_OK when reading data from an unfinished query. --- dlls/d3d9/tests/query.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/query.c b/dlls/d3d9/tests/query.c index 8bcfcf6..97d3508 100644 --- a/dlls/d3d9/tests/query.c +++ b/dlls/d3d9/tests/query.c @@ -190,10 +190,16 @@ static void test_occlusion_query_states(IDirect3D9 *pD3d, HWND hwnd) hr = IDirect3DQuery9_Issue(pQuery, D3DISSUE_BEGIN); ok(hr == D3D_OK, "IDirect3DQuery9_Issue(D3DQUERY_BEGIN) on a started query returned %08x\n", hr); + *((DWORD *)data) = 0x12345678; hr = IDirect3DQuery9_GetData(pQuery, NULL, 0, D3DGETDATA_FLUSH); - ok(hr == S_FALSE, "IDirect3DQuery9_GetData(NULL) on a started query returned %08x\n", hr); + ok(hr == S_FALSE || hr == D3D_OK, "IDirect3DQuery9_GetData(NULL) on a started query returned %08x\n", hr); hr = IDirect3DQuery9_GetData(pQuery, data, IDirect3DQuery9_GetDataSize(pQuery), D3DGETDATA_FLUSH); - ok(hr == S_FALSE, "IDirect3DQuery9_GetData on a started query returned %08x\n", hr); + ok(hr == S_FALSE || hr == D3D_OK, "IDirect3DQuery9_GetData on a started query returned %08x\n", hr); + if (hr == D3D_OK) + { + DWORD value = *((DWORD *)data); + ok(value == 0, "The unfinished query returned %u, expected 0\n", value); + } hr = IDirect3DDevice9_SetFVF(pDevice, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr);

1 0

Stefan Dösinger : wined3d: Fix a few function definitions.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 813c2737253aa05705c9e5a855a79bd8e1b3d5c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=813c2737253aa05705c9e5a85… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 23 16:34:11 2011 +0200 wined3d: Fix a few function definitions. --- dlls/wined3d/device.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2c326e7..12f1023 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1888,7 +1888,7 @@ HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device, * stateblock problems. When capturing the state block, I duplicate the * hashmap, but when recording, just build a chain pretty much of commands to * be replayed. */ -HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, DWORD light_idx, const WINED3DLIGHT *light) +HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, UINT light_idx, const WINED3DLIGHT *light) { UINT hash_idx = LIGHTMAP_HASHFUNC(light_idx); struct wined3d_light_info *object = NULL; @@ -2225,7 +2225,7 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, UINT return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_clip_plane(struct wined3d_device *device, DWORD plane_idx, float *plane) +HRESULT CDECL wined3d_device_get_clip_plane(struct wined3d_device *device, UINT plane_idx, float *plane) { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); @@ -3690,7 +3690,7 @@ HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *devi } HRESULT CDECL wined3d_device_get_texture_stage_state(struct wined3d_device *device, - DWORD stage, WINED3DTEXTURESTAGESTATETYPE state, DWORD *value) + UINT stage, WINED3DTEXTURESTAGESTATETYPE state, DWORD *value) { TRACE("device %p, stage %u, state %s, value %p.\n", device, stage, debug_d3dtexturestate(state), value); @@ -3708,7 +3708,7 @@ HRESULT CDECL wined3d_device_get_texture_stage_state(struct wined3d_device *devi } HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, - DWORD stage, struct wined3d_texture *texture) + UINT stage, struct wined3d_texture *texture) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_texture *prev; @@ -3815,7 +3815,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_texture(struct wined3d_device *device, - DWORD stage, struct wined3d_texture **texture) + UINT stage, struct wined3d_texture **texture) { TRACE("device %p, stage %u, texture %p.\n", device, stage, texture); @@ -5030,7 +5030,7 @@ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_render_target(struct wined3d_device *device, - DWORD render_target_idx, struct wined3d_surface **render_target) + UINT render_target_idx, struct wined3d_surface **render_target) { TRACE("device %p, render_target_idx %u, render_target %p.\n", device, render_target_idx, render_target); @@ -5066,7 +5066,7 @@ HRESULT CDECL wined3d_device_get_depth_stencil(struct wined3d_device *device, st } HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, - DWORD render_target_idx, struct wined3d_surface *render_target, BOOL set_viewport) + UINT render_target_idx, struct wined3d_surface *render_target, BOOL set_viewport) { struct wined3d_surface *prev;

1 0

Dylan Smith : ddraw: Keep a function declaration within the include guard.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 0be691ad9fe2f75600b8012ff118760a2dffbe1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be691ad9fe2f75600b8012ff… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 23 17:58:53 2011 -0400 ddraw: Keep a function declaration within the include guard. --- dlls/ddraw/ddraw_private.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a0f460e..aa50feb 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -612,7 +612,6 @@ static inline void copy_to_surfacedesc2(DDSURFACEDESC2 *to, DDSURFACEDESC2 *from DD_STRUCT_COPY_BYSIZE_(to, from, from_size); } +HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN; #endif - -HRESULT hr_ddraw_from_wined3d(HRESULT hr) DECLSPEC_HIDDEN;

1 0

Dylan Smith : ddraw: Don't interpret end padding as dwCaps2 for x64.
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: f7002c66278abf60ced3e2623eb00aaa3bccd218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7002c66278abf60ced3e2623… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 23 17:58:46 2011 -0400 ddraw: Don't interpret end padding as dwCaps2 for x64. --- dlls/ddraw/ddraw.c | 3 +-- dlls/ddraw/ddraw_private.h | 18 ++++++++++++++++-- dlls/ddraw/surface.c | 4 +--- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3b12003..cac05d3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3125,8 +3125,7 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; /* Modify some flags */ - desc2.dwSize = sizeof(desc2); /* For the struct copy */ - DD_STRUCT_COPY_BYSIZE(&desc2, DDSD); + copy_to_surfacedesc2(&desc2, DDSD); desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); /* Just to be sure */ /* Get the video mode from WineD3D - we will need it */ diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 78cb3b4..a0f460e 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -588,16 +588,30 @@ typedef struct /* Structure copy */ #define ME(x,f,e) { x, #x, (void (*)(const void *))(f), offsetof(STRUCT, e) } -#define DD_STRUCT_COPY_BYSIZE(to,from) \ +#define DD_STRUCT_COPY_BYSIZE_(to,from,from_size) \ do { \ DWORD __size = (to)->dwSize; \ - DWORD __copysize = min(__size, (from)->dwSize); \ + DWORD __copysize = min(__size, from_size); \ assert(to != from); \ memcpy(to, from, __copysize); \ memset((char*)(to) + __copysize, 0, __size - __copysize); \ (to)->dwSize = __size; /* restore size */ \ } while (0) +#define DD_STRUCT_COPY_BYSIZE(to,from) DD_STRUCT_COPY_BYSIZE_(to,from,(from)->dwSize) + +#define SIZEOF_END_PADDING(type, last_field) \ + (sizeof(type) - offsetof(type, last_field) - sizeof(((type *)0)->last_field)) + +static inline void copy_to_surfacedesc2(DDSURFACEDESC2 *to, DDSURFACEDESC2 *from) +{ + DWORD from_size = from->dwSize; + if (from_size == sizeof(DDSURFACEDESC)) + from_size -= SIZEOF_END_PADDING(DDSURFACEDESC, ddsCaps); + to->dwSize = sizeof(DDSURFACEDESC2); /* for struct copy */ + DD_STRUCT_COPY_BYSIZE_(to, from, from_size); +} + #endif diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f46c200..0b78b03 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3565,9 +3565,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->version = 7; surface->ddraw = ddraw; - surface->surface_desc.dwSize = sizeof(DDSURFACEDESC2); - surface->surface_desc.u4.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - DD_STRUCT_COPY_BYSIZE(&surface->surface_desc, desc); + copy_to_surfacedesc2(&surface->surface_desc, desc); surface->first_attached = surface; surface->ImplType = surface_type;

1 0

Aric Stewart : usp10: Determine glyph properties after shaping for scripts with no justification .
by Alexandre Julliard May 24, 2011

May 24, 2011

Module: wine Branch: master Commit: 953c7a34275390b17b83f12df3e612ed03882994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=953c7a34275390b17b83f12df… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 23 11:41:43 2011 -0500 usp10: Determine glyph properties after shaping for scripts with no justification. --- dlls/usp10/shape.c | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 18ae11b..047acc5 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -50,6 +50,7 @@ typedef VOID (*ShapeCharGlyphPropProc)( HDC , ScriptCache*, SCRIPT_ANALYSIS*, co static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp); static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); +static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); extern const unsigned short wine_shaping_table[]; extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4]; @@ -390,16 +391,16 @@ static const ScriptShapeData ShapingData[] = {{ arabic_features, 6}, required_arabic_features, "arab", ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, required_arabic_features, "arab", ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ hebrew_features, 1}, NULL, "hebr", NULL, NULL}, - {{ syriac_features, 4}, required_syriac_features, "syrc", ContextualShape_Syriac, NULL}, + {{ syriac_features, 4}, required_syriac_features, "syrc", ContextualShape_Syriac, ShapeCharGlyphProp_None}, {{ arabic_features, 6}, required_arabic_features, "arab", ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, - {{ NULL, 0}, NULL, "thaa", NULL, NULL}, + {{ NULL, 0}, NULL, "thaa", NULL, ShapeCharGlyphProp_None}, {{ standard_features, 2}, NULL, "grek", NULL, NULL}, {{ standard_features, 2}, NULL, "cyrl", NULL, NULL}, {{ standard_features, 2}, NULL, "armn", NULL, NULL}, {{ standard_features, 2}, NULL, "geor", NULL, NULL}, {{ sinhala_features, 7}, NULL, "sinh", NULL, NULL}, - {{ tibetan_features, 2}, NULL, "tibt", NULL, NULL}, - {{ tibetan_features, 2}, NULL, "tibt", NULL, NULL}, + {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_None}, + {{ tibetan_features, 2}, NULL, "tibt", NULL, ShapeCharGlyphProp_None}, {{ tibetan_features, 2}, NULL, "phag", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, "thai", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, "thai", NULL, ShapeCharGlyphProp_Thai}, @@ -1703,6 +1704,42 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } } +static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp) +{ + int i,k; + + for (i = 0; i < cGlyphs; i++) + { + int char_index[20]; + int char_count = 0; + + for (k = 0; k < cChars; k++) + { + if (pwLogClust[k] == i) + { + char_index[char_count] = k; + char_count++; + } + } + + if (char_count == 0) + { + FIXME("No chars in this glyph? Must be an error\n"); + continue; + } + + if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ + { + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; + pCharProp[char_index[0]].fCanGlyphAlone = 1; + } + else + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; + } + GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); +} + void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) { if (ShapingData[psa->eScript].charGlyphPropProc)

1 0