wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Dan Kegel : cmd: del /a: move parsing of attributes to helper function, use bitmasks.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 65b27c9ecd2c80aa91fa0c5425ddfb2f9f2cb37d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b27c9ecd2c80aa91fa0c542… Author: Dan Kegel <dank(a)kegel.com> Date: Sun May 22 07:59:22 2011 -0700 cmd: del /a: move parsing of attributes to helper function, use bitmasks. --- programs/cmd/builtins.c | 111 +++++++++++++++++++++++------------------------ 1 files changed, 54 insertions(+), 57 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 944a997..7a6ae72 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -532,6 +532,53 @@ void WCMD_create_dir (void) { if (!create_full_path(param1)) WCMD_print_error (); } +/* Parse the /A options given by the user on the commandline + * into a bitmask of wanted attributes (*wantSet), + * and a bitmask of unwanted attributes (*wantClear). + */ +static void WCMD_delete_parse_attributes(DWORD *wantSet, DWORD *wantClear) { + static const WCHAR parmA[] = {'/','A','\0'}; + WCHAR *p; + + /* both are strictly 'out' parameters */ + *wantSet=0; + *wantClear=0; + + /* For each /A argument */ + for (p=strstrW(quals, parmA); p != NULL; p=strstrW(p, parmA)) { + /* Skip /A itself */ + p += 2; + + /* Skip optional : */ + if (*p == ':') p++; + + /* For each of the attribute specifier chars to this /A option */ + for (; *p != 0 && *p != '/'; p++) { + BOOL negate = FALSE; + DWORD mask = 0; + + if (*p == '-') { + negate=TRUE; + p++; + } + + /* Convert the attribute specifier to a bit in one of the masks */ + switch (*p) { + case 'R': mask = FILE_ATTRIBUTE_READONLY; break; + case 'H': mask = FILE_ATTRIBUTE_HIDDEN; break; + case 'S': mask = FILE_ATTRIBUTE_SYSTEM; break; + case 'A': mask = FILE_ATTRIBUTE_ARCHIVE; break; + default: + WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); + } + if (negate) + *wantClear |= mask; + else + *wantSet |= mask; + } + } +} + /**************************************************************************** * WCMD_delete * @@ -551,11 +598,14 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { int argsProcessed = 0; WCHAR *argN = command; BOOL foundAny = FALSE; - static const WCHAR parmA[] = {'/','A','\0'}; static const WCHAR parmQ[] = {'/','Q','\0'}; static const WCHAR parmP[] = {'/','P','\0'}; static const WCHAR parmS[] = {'/','S','\0'}; static const WCHAR parmF[] = {'/','F','\0'}; + DWORD wanted_attrs; + DWORD unwanted_attrs; + + WCMD_delete_parse_attributes(&wanted_attrs, &unwanted_attrs); /* If not recursing, clear error flag */ if (expectDir) errorlevel = 0; @@ -644,64 +694,11 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { } else strcpyW (fpath, fd.cFileName); if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - BOOL ok = TRUE; - WCHAR *nextA = strstrW (quals, parmA); + BOOL ok; /* Handle attribute matching (/A) */ - if (nextA != NULL) { - ok = FALSE; - while (nextA != NULL && !ok) { - - WCHAR *thisA = (nextA+2); - BOOL stillOK = TRUE; - - /* Skip optional : */ - if (*thisA == ':') thisA++; - - /* Parse each of the /A[:]xxx in turn */ - while (*thisA && *thisA != '/') { - BOOL negate = FALSE; - BOOL attribute = FALSE; - - /* Match negation of attribute first */ - if (*thisA == '-') { - negate=TRUE; - thisA++; - } - - /* Match attribute */ - switch (*thisA) { - case 'R': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY); - break; - case 'H': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN); - break; - case 'S': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM); - break; - case 'A': attribute = (fd.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE); - break; - default: - WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); - } - - /* Now check result, keeping a running boolean about whether it - matches all parsed attributes so far */ - if (attribute && !negate) { - stillOK = stillOK; - } else if (!attribute && negate) { - stillOK = stillOK; - } else { - stillOK = FALSE; - } - thisA++; - } - - /* Save the running total as the final result */ - ok = stillOK; - - /* Step on to next /A set */ - nextA = strstrW (nextA+1, parmA); - } - } + ok = ((fd.dwFileAttributes & wanted_attrs) == wanted_attrs) + && ((fd.dwFileAttributes & unwanted_attrs) == 0); /* /P means prompt for each file */ if (ok && strstrW (quals, parmP) != NULL) {

1 0

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

24 May '11

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: Drop the fixed function varying test.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: e7c55939c4234f793dcfe52d34896a6cd2a2545c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c55939c4234f793dcfe52d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 23 18:18:54 2011 +0200 d3d9: Drop the fixed function varying test. Windows drivers return different values, some don't even draw. I don't know any app that depends on this. --- dlls/d3d9/tests/visual.c | 74 ++-------------------------------------------- 1 files changed, 3 insertions(+), 71 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e5c8745..5a2286d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5593,7 +5593,7 @@ struct hugeVertex DWORD diffuse, specular; }; -static void fixed_function_varying_test(IDirect3DDevice9 *device) { +static void pretransformed_varying_test(IDirect3DDevice9 *device) { /* dcl_position: fails to compile */ const DWORD blendweight_code[] = { 0xffff0300, /* ps_3_0 */ @@ -5675,20 +5675,6 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { }; /* Declare a monster vertex type :-) */ static const D3DVERTEXELEMENT9 decl_elements[] = { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - {0, 16, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDWEIGHT, 0}, - {0, 32, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDINDICES, 0}, - {0, 48, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, - {0, 64, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_FOG, 0}, - {0, 80, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, - {0, 96, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TANGENT, 0}, - {0, 112, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BINORMAL, 0}, - {0, 128, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_DEPTH, 0}, - {0, 144, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, - {0, 148, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 1}, - D3DDECL_END() - }; - static const D3DVERTEXELEMENT9 decl_elements2[] = { {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITIONT, 0}, {0, 16, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDWEIGHT, 0}, {0, 32, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDINDICES, 0}, @@ -5758,11 +5744,9 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { }; struct hugeVertex data2[4]; IDirect3DVertexDeclaration9 *decl; - IDirect3DVertexDeclaration9 *decl2; HRESULT hr; unsigned int i; DWORD color, r, g, b, r_e, g_e, b_e; - BOOL drawok; memcpy(data2, data, sizeof(data2)); data2[0].pos_x = 0; data2[0].pos_y = 0; @@ -5772,8 +5756,6 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); - hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements2, &decl2); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); @@ -5784,56 +5766,7 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { tests[i].name, hr); } - for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) - { - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); - - IDirect3DDevice9_SetPixelShader(device, tests[i].shader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); - drawok = FALSE; - if(SUCCEEDED(hr)) - { - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, data, sizeof(data[0])); - ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "DrawPrimitiveUP failed (%08x)\n", hr); - drawok = SUCCEEDED(hr); - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); - } - - /* Some drivers reject the combination of ps_3_0 and fixed function vertex processing. Accept - * the failure and do not check the color if it failed - */ - if(!drawok) { - continue; - } - - color = getPixelColor(device, 360, 240); - r = color & 0x00ff0000 >> 16; - g = color & 0x0000ff00 >> 8; - b = color & 0x000000ff; - r_e = tests[i].color & 0x00ff0000 >> 16; - g_e = tests[i].color & 0x0000ff00 >> 8; - b_e = tests[i].color & 0x000000ff; - - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - - if(tests[i].todo) { - todo_wine ok(abs(r - r_e) <= 1 && abs(g - g_e) <= 1 && abs(b - b_e) <= 1, - "Test %s returned color 0x%08x, expected 0x%08x(todo)\n", - tests[i].name, color, tests[i].color); - } else { - ok(abs(r - r_e) <= 1 && abs(g - g_e) <= 1 && abs(b - b_e) <= 1, - "Test %s returned color 0x%08x, expected 0x%08x\n", - tests[i].name, color, tests[i].color); - } - } - - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl2); + hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); for(i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { @@ -5883,7 +5816,6 @@ static void fixed_function_varying_test(IDirect3DDevice9 *device) { IDirect3DPixelShader9_Release(tests[i].shader); } - IDirect3DVertexDeclaration9_Release(decl2); IDirect3DVertexDeclaration9_Release(decl); } @@ -12175,7 +12107,7 @@ START_TEST(visual) dp2add_ps_test(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0) && caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { nested_loop_test(device_ptr); - fixed_function_varying_test(device_ptr); + pretransformed_varying_test(device_ptr); vFace_register_test(device_ptr); vpos_register_test(device_ptr); multiple_rendertargets_test(device_ptr);

1 0

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

24 May '11

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

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

24 May '11

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 24 May '11

24 May '11

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

Jacek Caban : ntoskrnl.exe: Added ObReferenceObjectByHandle stub.
by Alexandre Julliard 24 May '11

24 May '11

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

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

24 May '11

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 24 May '11

24 May '11

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

Dylan Smith : ddraw: Avoid clearing some memory unnecessarily.
by Alexandre Julliard 24 May '11

24 May '11

Module: wine Branch: master Commit: 3871329872afe3976e0b2b85330e3a7c47301658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3871329872afe3976e0b2b853… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 23 17:58:36 2011 -0400 ddraw: Avoid clearing some memory unnecessarily. --- dlls/ddraw/ddraw.c | 2 -- dlls/ddraw/ddraw_private.h | 23 +++++++++-------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 58eb452..3b12003 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3125,10 +3125,8 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; /* Modify some flags */ - memset(&desc2, 0, sizeof(desc2)); desc2.dwSize = sizeof(desc2); /* For the struct copy */ DD_STRUCT_COPY_BYSIZE(&desc2, DDSD); - desc2.dwSize = sizeof(desc2); /* To override a possibly smaller size */ 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 8aa69c1..78cb3b4 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -588,20 +588,15 @@ 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) \ - do { \ - DWORD __size = (to)->dwSize; \ - DWORD __copysize = __size; \ - DWORD __resetsize = __size; \ - assert(to != from); \ - if (__resetsize > sizeof(*to)) \ - __resetsize = sizeof(*to); \ - memset(to,0,__resetsize); \ - if ((from)->dwSize < __size) \ - __copysize = (from)->dwSize; \ - memcpy(to,from,__copysize); \ - (to)->dwSize = __size;/*restore size*/ \ - } while (0) +#define DD_STRUCT_COPY_BYSIZE(to,from) \ + do { \ + DWORD __size = (to)->dwSize; \ + DWORD __copysize = min(__size, (from)->dwSize); \ + assert(to != from); \ + memcpy(to, from, __copysize); \ + memset((char*)(to) + __copysize, 0, __size - __copysize); \ + (to)->dwSize = __size; /* restore size */ \ + } while (0) #endif

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
95
Older →

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