wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Stefan Dösinger : d3d9: Win7+Nvidia returns c2 in COISSUE'd CND.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: e534e2e2ac28bbe23cf43cb21f19dd2655748414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e534e2e2ac28bbe23cf43cb21… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 3 16:17:36 2010 +0200 d3d9: Win7+Nvidia returns c2 in COISSUE'd CND. --- dlls/d3d9/tests/visual.c | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4aaa56c..734bb82 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5138,9 +5138,10 @@ static void cnd_test(IDirect3DDevice9 *device) /* Special fun: The coissue flag on cnd: Apparently cnd always selects the 2nd source, * as if the src0 comparison against 0.5 always evaluates to true. The coissue flag isn't - * set by the compiler, it was added manually after compilation. It isn't always allowed, - * only if there's a mov r0.a, XXXX, and the cnd instruction writes to r0.xyz, otherwise - * native CreatePixelShader returns an error. + * set by the compiler, it was added manually after compilation. Note that the COISSUE + * flag on a color(.xyz) operation is only allowed after an alpha operation. DirectX doesn't + * have proper docs, but GL_ATI_fragment_shader explains the pairing of color and alpha ops + * good enough. * * The shader attempts to test the range [-1;1] against coissued cnd, which is a bit tricky. * The input from t0 is [0;1]. 0.5 is substracted, then we have to multiply with 2. Since @@ -5387,46 +5388,48 @@ static void cnd_test(IDirect3DDevice9 *device) color = getPixelColor(device, 162, 122); ok(color == 0x000000ff, "pixel 162, 122 has color %08x, expected 0x000000ff\n", color); - /* 1.1 shader. coissue flag changed the semantic of cnd, c1 is always selected */ + /* 1.1 shader. coissue flag changed the semantic of cnd, c1 is always selected + * (The Win7 nvidia driver always selects c2) + */ color = getPixelColor(device, 158, 358); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 158, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 358); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 162, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 158, 362); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 158, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 162, 362); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 162, 362 has color %08x, expected 0x0000ff00\n", color); /* 1.2 shader */ color = getPixelColor(device, 478, 358); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 478, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 358); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 482, 358 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 362); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 478, 362 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 362); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 482, 362 has color %08x, expected 0x0000ff00\n", color); /* 1.3 shader */ color = getPixelColor(device, 478, 118); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 478, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 118); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 482, 118 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 478, 122); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 478, 122 has color %08x, expected 0x0000ff00\n", color); color = getPixelColor(device, 482, 122); - ok(color_match(color, 0x0000ff00, 1), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x00ff00ff, 1), "pixel 482, 122 has color %08x, expected 0x0000ff00\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0

Stefan Dösinger : d3d9: Remove the fog vs sRGB test.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 24adf40ee1531e76ec0df397228c28732cf7ea52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24adf40ee1531e76ec0df3972… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 20 12:47:28 2010 +0200 d3d9: Remove the fog vs sRGB test. --- dlls/d3d9/tests/visual.c | 109 ---------------------------------------------- 1 files changed, 0 insertions(+), 109 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0168222..4aaa56c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7032,114 +7032,6 @@ bail: IDirect3DVertexBuffer9_Release(vb_list); } - -static void fog_srgbwrite_test(IDirect3DDevice9 *device) -{ - /* Draw a black quad, half fogged with white fog -> grey color. Enable sRGB writing. - * if sRGB writing is applied before fogging, the 0.0 will be multiplied with ~ 12.92, so still - * stay 0.0. After that the fog gives 0.5. If sRGB writing is applied after fogging, the - * 0.5 will run through the alternative path(0^5 ^ 0.41666 * 1.055 - 0.055), resulting in approx. - * 0.73 - * - * At the time of this writing, wined3d could not apply sRGB correction to fixed function rendering, - * so use shaders for this task - */ - IDirect3DPixelShader9 *pshader; - IDirect3DVertexShader9 *vshader; - IDirect3D9 *d3d; - DWORD vshader_code[] = { - 0xfffe0101, /* vs_1_1 */ - 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ - 0x00000051, 0xa00f0000, 0x3f000000, 0x00000000, 0x00000000, 0x00000000, /* def c0, 0.5, 0.0, 0.0, 0.0 */ - 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ - 0x00000001, 0xc00f0001, 0xa0000000, /* mov oFog, c0.x */ - 0x0000ffff /* end */ - }; - DWORD pshader_code[] = { - 0xffff0101, /* ps_1_1 */ - 0x00000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, /* def c0, 0.0, 0.0, 0.0, 0.0 */ - 0x00000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ - 0x0000ffff /* end */ - }; - const float quad[] = { - -1.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - -1.0, 1.0, 0.1, - 1.0, 1.0, 0.1 - }; - HRESULT hr; - D3DCOLOR color; - - IDirect3DDevice9_GetDirect3D(device, &d3d); - /* Ask for srgb writing on D3DRTYPE_TEXTURE. Some Windows drivers do not report it on surfaces. - * For some not entirely understood reasons D3DUSAGE_RENDERTARGET | D3DUSAGE_QUERY_SRGBWRITE - * passes on surfaces, while asking for SRGBWRITE alone fails. Textures advertize srgb writing - * alone as well, so use that since it is not the point of this test to show how CheckDeviceFormat - * works - */ - if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_RENDERTARGET | D3DUSAGE_QUERY_SRGBWRITE, - D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8) != D3D_OK) { - skip("No SRGBWRITEENABLE support on D3DFMT_X8R8G8B8\n"); - IDirect3D9_Release(d3d); - return; - } - IDirect3D9_Release(d3d); - - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); - - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0xffffffff); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, TRUE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - - hr = IDirect3DDevice9_CreateVertexShader(device, vshader_code, &vshader); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader returned %08x\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, pshader_code, &pshader); - ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); - ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, vshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, pshader); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); - - hr = IDirect3DDevice9_BeginScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); - if(SUCCEEDED(hr)) { - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(float) * 3); - ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); - } - - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader returned %08x\n", hr); - IDirect3DPixelShader9_Release(pshader); - IDirect3DVertexShader9_Release(vshader); - - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRGBWRITEENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - - color = getPixelColor(device, 160, 360); - ok(color_match(color, 0x00808080, 1), - "Fog with D3DRS_SRGBWRITEENABLE returned color 0x%08x, expected 0x00808080\n", color); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); -} - static void alpha_test(IDirect3DDevice9 *device) { HRESULT hr; @@ -11408,7 +11300,6 @@ START_TEST(visual) if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1) && caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) { fog_with_shader_test(device_ptr); - fog_srgbwrite_test(device_ptr); } else skip("No vs_1_1 and ps_1_1 support\n");

1 0

Luke Bratch : wined3d: Add Nvidia 8800GTX detection.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: c63c568731ba4440df5cffc2a98d6e5a97a47451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63c568731ba4440df5cffc2a… Author: Luke Bratch <l_bratch(a)yahoo.co.uk> Date: Tue Jul 20 17:02:17 2010 +0000 wined3d: Add Nvidia 8800GTX detection. --- dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5705def..3e6e38d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1014,6 +1014,7 @@ static const struct driver_version_information driver_version_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 15, 11, 9745 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTX, "NVIDIA GeForce 8800 GTX", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 15, 11, 9745 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 15, 11, 9745 }, @@ -1385,6 +1386,13 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_9200; } + /* Geforce8 - highend high*/ + if (strstr(gl_renderer, "8800 GTX")) + { + *vidmem = 768; + return CARD_NVIDIA_GEFORCE_8800GTX; + } + /* Geforce8 - highend */ if (strstr(gl_renderer, "8800")) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f5fb280..8773248 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1304,6 +1304,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_8600GT = 0x0402, CARD_NVIDIA_GEFORCE_8600MGT = 0x0407, CARD_NVIDIA_GEFORCE_8800GTS = 0x0193, + CARD_NVIDIA_GEFORCE_8800GTX = 0x0191, CARD_NVIDIA_GEFORCE_9200 = 0x086d, CARD_NVIDIA_GEFORCE_9400GT = 0x042c, CARD_NVIDIA_GEFORCE_9500GT = 0x0640,

1 0

Austin English : setupapi/tests: Remove unused variable.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: f7f38c5def12cd36bf0107eb6a6a95a514f2cbcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7f38c5def12cd36bf0107eb6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 21 02:27:18 2010 -0500 setupapi/tests: Remove unused variable. --- dlls/setupapi/tests/parser.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 072ac97..53f7cc0 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -406,7 +406,7 @@ static const char *check_key( INFCONTEXT *context, const char *wanted ) static void test_key_names(void) { char buffer[MAX_INF_STRING_LENGTH+32]; - const char *key, *line; + const char *line; unsigned int i, index, count; UINT err_line; HINF hinf; @@ -426,7 +426,7 @@ static void test_key_names(void) ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); assert( ret ); - key = check_key( &context, key_names[i].key ); + check_key( &context, key_names[i].key ); buffer[0] = buffer[1] = 0; /* build the full line */ for (index = 0; ; index++)

1 0

Austin English : ws2_32: Remove unused variable.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: cdf091f2c9584994706cfea395131e4f2e8f87b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf091f2c9584994706cfea39… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 20 23:42:48 2010 -0500 ws2_32: Remove unused variable. --- dlls/ws2_32/socket.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2fde6e6..2597c8d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3120,15 +3120,13 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, ULONG Information ) { - NTSTATUS status; - SERVER_START_REQ( add_fd_completion ) { req->handle = wine_server_obj_handle( SOCKET2HANDLE(sock) ); req->cvalue = CompletionValue; req->status = CompletionStatus; req->information = Information; - status = wine_server_call( req ); + wine_server_call( req ); } SERVER_END_REQ; }

1 0

Alexandre Julliard : rundll32: Fix a pointer conversion warning on 64-bit.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 59ef151a93b79be888845eaf3c1ae7d4b04e09e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ef151a93b79be888845eaf3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 11:09:20 2010 +0200 rundll32: Fix a pointer conversion warning on 64-bit. --- programs/rundll32/rundll32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index c619693..53508c9 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -123,7 +123,7 @@ static void *get_entry_point32( HMODULE module, LPCWSTR entry, BOOL *unicode ) /* determine if the entry point is an ordinal */ if (entry[0] == '#') { - int ordinal = atoiW( entry + 1 ); + INT_PTR ordinal = atoiW( entry + 1 ); if (ordinal <= 0) return NULL;

1 0

Alexandre Julliard : msvcrt/tests: Fix printf format warnings with ptrdiff_t.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: a38ff8d7dd9741d3346a7982483375dee5748d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38ff8d7dd9741d3346a79824… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 11:09:15 2010 +0200 msvcrt/tests: Fix printf format warnings with ptrdiff_t. --- dlls/msvcrt/tests/string.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index b70d777..55cb5e4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1102,23 +1102,23 @@ static void test__strtod(void) d = strtod(double1, &end); ok(almost_equal(d, 12.1), "d = %lf\n", d); - ok(end == double1+4, "incorrect end (%d)\n", end-double1); + ok(end == double1+4, "incorrect end (%d)\n", (int)(end-double1)); d = strtod(double2, &end); ok(almost_equal(d, -13.721), "d = %lf\n", d); - ok(end == double2+7, "incorrect end (%d)\n", end-double2); + ok(end == double2+7, "incorrect end (%d)\n", (int)(end-double2)); d = strtod(double3, &end); ok(almost_equal(d, 0), "d = %lf\n", d); - ok(end == double3, "incorrect end (%d)\n", end-double3); + ok(end == double3, "incorrect end (%d)\n", (int)(end-double3)); d = strtod(double4, &end); ok(almost_equal(d, 210000000000.0), "d = %lf\n", d); - ok(end == double4+6, "incorrect end (%d)\n", end-double4); + ok(end == double4+6, "incorrect end (%d)\n", (int)(end-double4)); d = strtod(double5, &end); ok(almost_equal(d, 214.353), "d = %lf\n", d); - ok(end == double5+9, "incorrect end (%d)\n", end-double5); + ok(end == double5+9, "incorrect end (%d)\n", (int)(end-double5)); d = strtod("12.1d2", NULL); ok(almost_equal(d, 12.1e2), "d = %lf\n", d); @@ -1156,7 +1156,7 @@ static void test__strtod(void) errno = 0xdeadbeef; d = strtod(overflow, &end); ok(errno == ERANGE, "errno = %x\n", errno); - ok(end == overflow+21, "incorrect end (%d)\n", end-overflow); + ok(end == overflow+21, "incorrect end (%d)\n", (int)(end-overflow)); errno = 0xdeadbeef; strtod("-1d309", NULL);

1 0

Alexandre Julliard : gphoto2.ds: Remove unused variables.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: c64a0fd9890ef12ff0cc9abb17bdb07605da41dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64a0fd9890ef12ff0cc9abb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 11:09:12 2010 +0200 gphoto2.ds: Remove unused variables. --- dlls/gphoto2.ds/ds_image.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index ec29eff..f26b3dd 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -384,7 +384,7 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, pTW_UINT32 pHandle = (pTW_UINT32) pData; HBITMAP hDIB; BITMAPINFO bmpInfo; - LPBYTE bits, oldbits; + LPBYTE bits; JSAMPROW samprow, oldsamprow; HDC dc; @@ -438,7 +438,6 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } samprow = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,activeDS.jd.output_width*activeDS.jd.output_components); - oldbits = bits; oldsamprow = samprow; while ( activeDS.jd.output_scanline<activeDS.jd.output_height ) { int i, x = pjpeg_read_scanlines(&activeDS.jd,&samprow,1); @@ -455,7 +454,6 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, bits = (LPBYTE)(((UINT_PTR)bits + 3) & ~3); samprow = oldsamprow; } - bits = oldbits; HeapFree (GetProcessHeap(), 0, samprow); gp_file_unref (activeDS.file); activeDS.file = NULL; @@ -575,7 +573,7 @@ _get_gphoto2_file_as_DIB( struct jpeg_error_mgr jerr; HDC dc; BITMAPINFO bmpInfo; - LPBYTE bits, oldbits; + LPBYTE bits; JSAMPROW samprow, oldsamprow; if(!libjpeg_handle) { @@ -648,7 +646,6 @@ _get_gphoto2_file_as_DIB( return TWRC_FAILURE; } samprow = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,jd.output_width*jd.output_components); - oldbits = bits; oldsamprow = samprow; while ( jd.output_scanline<jd.output_height ) { int i, x = pjpeg_read_scanlines(&jd,&samprow,1);

1 0

Alexandre Julliard : sane.ds: Remove unused variables.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: 474899dbcd9e4dabafcc46700305935a0a03514e URL: http://source.winehq.org/git/wine.git/?a=commit;h=474899dbcd9e4dabafcc46700… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 11:06:52 2010 +0200 sane.ds: Remove unused variables. --- dlls/sane.ds/options.c | 3 --- dlls/sane.ds/sane_main.c | 3 +-- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index c78cf8e..67cb1dc 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -252,15 +252,12 @@ static void convert_double_fix32(double d, TW_FIX32 *fix32) BOOL convert_sane_res_to_twain(double sane_res, SANE_Unit unit, TW_FIX32 *twain_res, TW_UINT16 twtype) { - double d; - if (unit != SANE_UNIT_MM) return FALSE; if (twtype != TWUN_INCHES) return FALSE; - d = (sane_res / 10.0) / 2.54; convert_double_fix32((sane_res / 10.0) / 2.54, twain_res); return TRUE; diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index a873d6c..13422bb 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -92,14 +92,13 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { case DLL_PROCESS_ATTACH: { #ifdef SONAME_LIBSANE - SANE_Status status; SANE_Int version_code; libsane_handle = open_libsane(); if (! libsane_handle) return FALSE; - status = psane_init (&version_code, NULL); + psane_init (&version_code, NULL); #endif SANE_instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL);

1 0

Alexandre Julliard : d3d9/tests: Avoid sizeof in a trace.
by Alexandre Julliard 21 Jul '10

21 Jul '10

Module: wine Branch: master Commit: cbc6ef9e911274db0b5c937661f9b2e8a9852cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc6ef9e911274db0b5c93766… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 21 11:06:32 2010 +0200 d3d9/tests: Avoid sizeof in a trace. --- dlls/d3d9/tests/d3d9ex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5af2e4e..f84ad7d 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -302,7 +302,7 @@ static void test_get_adapter_displaymode_ex(void) hr = IDirect3D9_GetAdapterDisplayMode(d3d9, D3DADAPTER_DEFAULT, &mode); ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); - ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "size is %d instead of %d\n", mode_ex.Size, sizeof(D3DDISPLAYMODEEX)); + ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "size is %d\n", mode_ex.Size); todo_wine ok(mode_ex.Width == mode.Width, "width is %d instead of %d\n", mode_ex.Width, mode.Width); todo_wine ok(mode_ex.Height == mode.Height, "height is %d instead of %d\n", mode_ex.Height, mode.Height); todo_wine ok(mode_ex.RefreshRate == mode.RefreshRate, "RefreshRate is %d instead of %d\n", mode_ex.RefreshRate, mode.RefreshRate);

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
90
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 July 2010