wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Henri Verbeet : d3d8/tests: Use a separate device for fog_special_test().
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: b17ff75649634f67aff2bcf386072fa143ec50e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17ff75649634f67aff2bcf38… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:22 2014 +0200 d3d8/tests: Use a separate device for fog_special_test(). --- dlls/d3d8/tests/visual.c | 67 +++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e3e33e2..702c299 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3879,8 +3879,23 @@ static void zenable_test(IDirect3DDevice8 *device) } } -static void fog_special_test(IDirect3DDevice8 *device) +static void fog_special_test(void) { + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + DWORD ps, vs; + HWND window; + HRESULT hr; + union + { + float f; + DWORD d; + } conv; + static const struct { struct vec3 position; @@ -3889,8 +3904,8 @@ static void fog_special_test(IDirect3DDevice8 *device) quad[] = { {{ -1.0f, -1.0f, 0.0f}, 0xff00ff00}, - {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, {{ -1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, {{ 1.0f, 1.0f, 1.0f}, 0xff00ff00} }; static const struct @@ -3931,16 +3946,23 @@ static void fog_special_test(IDirect3DDevice8 *device) 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ 0x0000ffff }; - union + static const D3DMATRIX identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) { - float f; - DWORD d; - } conv; - DWORD color; - HRESULT hr; - unsigned int i; - DWORD ps, vs; - D3DCAPS8 caps; + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); @@ -3965,6 +3987,14 @@ static void fog_special_test(IDirect3DDevice8 *device) ps = 0; } + /* The table fog tests seem to depend on the projection matrix explicitly + * being set to an identity matrix, even though that's the default. + * (AMD Radeon HD 6310, Windows 7) */ + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &identity); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); ok(SUCCEEDED(hr), "Failed to enable fog, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0xffff0000); @@ -3978,7 +4008,7 @@ static void fog_special_test(IDirect3DDevice8 *device) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); if (!tests[i].vs) @@ -4034,16 +4064,15 @@ static void fog_special_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); } - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); if (vs) IDirect3DDevice8_DeleteVertexShader(device, vs); if (ps) IDirect3DDevice8_DeletePixelShader(device, ps); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void volume_dxt5_test(void) @@ -4759,7 +4788,6 @@ START_TEST(visual) multisample_copy_rects_test(device_ptr); zenable_test(device_ptr); resz_test(device_ptr); - fog_special_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4767,6 +4795,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + fog_special_test(); volume_dxt5_test(); volume_v16u16_test(); add_dirty_rect_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for volume_dxt5_test().
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: d93cbeca511856aad65675f24ad5ee9f079160f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93cbeca511856aad65675f24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:21 2014 +0200 d3d8/tests: Use a separate device for volume_dxt5_test(). --- dlls/d3d8/tests/visual.c | 52 ++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ce4de4a..e3e33e2 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4046,14 +4046,18 @@ static void fog_special_test(IDirect3DDevice8 *device) IDirect3DDevice8_DeletePixelShader(device, ps); } -static void volume_dxt5_test(IDirect3DDevice8 *device) +static void volume_dxt5_test(void) { - HRESULT hr; - IDirect3D8 *d3d8; IDirect3DVolumeTexture8 *texture; + IDirect3DDevice8 *device; D3DLOCKED_BOX box; + IDirect3D8 *d3d; unsigned int i; - DWORD color; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + static const char texture_data[] = { /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ @@ -4070,26 +4074,33 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) quads[] = { {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, - {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, - {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; - hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); - ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); - hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5); - IDirect3D8_Release(d3d8); - if (FAILED(hr)) + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) { - skip("Volume dxt5 textures are not supported, skipping test.\n"); - return; + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5))) + { + skip("Volume DXT5 textures are not supported, skipping test.\n"); + IDirect3DDevice8_Release(device); + goto done; } hr = IDirect3DDevice8_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, @@ -4115,7 +4126,7 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); hr = IDirect3DDevice8_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); @@ -4135,11 +4146,12 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); } - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); IDirect3DVolumeTexture8_Release(texture); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void volume_v16u16_test(void) @@ -4748,7 +4760,6 @@ START_TEST(visual) zenable_test(device_ptr); resz_test(device_ptr); fog_special_test(device_ptr); - volume_dxt5_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4756,6 +4767,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + volume_dxt5_test(); volume_v16u16_test(); add_dirty_rect_test(); }

1 0

Nikolay Sivov : urlmon/tests: Fix use after free of IPersistStream interface.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 96cf9a289895d2cfce0fcb06896bc94f68494d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96cf9a289895d2cfce0fcb068… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 16 08:47:45 2014 +0400 urlmon/tests: Fix use after free of IPersistStream interface. --- dlls/urlmon/tests/uri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index cf10cb2..f142ffb 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -11299,7 +11299,6 @@ static void test_IPersistStream(void) ok(props == 0, "%d) Not all properties were processed %d. Next property type: %d\n", i, props, dw_data[0]); - IPersistStream_Release(persist_stream); IUri_Release(uri); hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); @@ -11307,6 +11306,8 @@ static void test_IPersistStream(void) hr = IPersistStream_GetClassID(persist_stream, &curi); ok(hr == S_OK, "%d) GetClassID failed 0x%08x, expected S_OK.\n", i, hr); ok(IsEqualCLSID(&curi, &CLSID_CUri), "%d) GetClassID returned incorrect CLSID.\n", i); + IPersistStream_Release(persist_stream); + hr = CoCreateInstance(&curi, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUri, (void**)&uri); ok(hr == S_OK, "%d) Error creating uninitialized Uri: 0x%08x.\n", i, hr); @@ -11322,6 +11323,7 @@ static void test_IPersistStream(void) "%d) Expected %s but got %s.\n", i, test->str_props[Uri_PROPERTY_RAW_URI].value, wine_dbgstr_w(raw_uri)); SysFreeString(raw_uri); + IPersistStream_Release(persist_stream); hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); ok(hr == S_OK, "%d) QueryInterface(IID_IMarshal) failed 0x%08x, expected S_OK.\n", i, hr); @@ -11395,7 +11397,6 @@ static void test_IPersistStream(void) IMarshal_Release(marshal); IStream_Release(stream); - IPersistStream_Release(persist_stream); IUri_Release(uri); heap_free(uriW); }

1 0

Nikolay Sivov : msxml3/tests: Fix accessing released intreface pointer.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 026c861794a43bc8e538bc4fdff97f32bc71a79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=026c861794a43bc8e538bc4fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 16 08:35:50 2014 +0400 msxml3/tests: Fix accessing released intreface pointer. --- dlls/msxml3/tests/domdoc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 50f0941..1a2ec5e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -376,9 +376,10 @@ static void _expect_no_children(IXMLDOMNode *node, int line) #define EXPECT_REF(node,ref) _expect_ref((IUnknown*)node, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { - ULONG rc = IUnknown_AddRef(obj); - IUnknown_Release(obj); - ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } #define EXPECT_LIST_LEN(list,len) _expect_list_len(list, len, __LINE__) @@ -2493,18 +2494,18 @@ todo_wine { EXPECT_REF(elem2, 2); todo_wine ok(unk == unk2, "got %p and %p\n", unk, unk2); - IUnknown_Release(unk); - IUnknown_Release(unk2); /* IUnknown refcount is not affected by node refcount */ - todo_wine EXPECT_REF(unk2, 3); + todo_wine EXPECT_REF(unk2, 4); IXMLDOMElement_AddRef(elem2); - todo_wine EXPECT_REF(unk2, 3); + todo_wine EXPECT_REF(unk2, 4); IXMLDOMElement_Release(elem2); IXMLDOMElement_Release(elem2); - todo_wine EXPECT_REF(unk2, 2); + todo_wine EXPECT_REF(unk2, 3); + + IUnknown_Release(unk2); hr = IXMLDOMElement_get_childNodes( element, &node_list ); EXPECT_HR(hr, S_OK);

1 0

Austin English : user.exe16: Downgrade a couple MESSAGEs to WARNs.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 39730102aa84ad4718b2eec41cbb595017d618dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=39730102aa84ad4718b2eec41… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 15 17:12:48 2014 -0700 user.exe16: Downgrade a couple MESSAGEs to WARNs. --- dlls/user.exe16/message.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 48799ab..935b025 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -882,14 +882,14 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 case 0: if (hi) { - MESSAGE("DDE_ACK: neither atom nor handle!!!\n"); + WARN("DDE_ACK: neither atom nor handle!!!\n"); hi = 0; } break; case 1: break; /* atom, nothing to do */ case 3: - MESSAGE("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); + WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); /* fall through */ case 2: hi = convert_handle_16_to_32(hi, GMEM_DDESHARE); @@ -1262,14 +1262,14 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case 0: if (hi) { - MESSAGE("DDE_ACK: neither atom nor handle!!!\n"); + WARN("DDE_ACK: neither atom nor handle!!!\n"); hi = 0; } break; case 1: break; /* atom, nothing to do */ case 3: - MESSAGE("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); + WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); /* fall through */ case 2: hi = convert_handle_32_to_16(hi, GMEM_DDESHARE);

1 0

Nikolay Sivov : svchost: Simplify error handling, fix trace message.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: wine Branch: master Commit: 463f91dce16578829bc0593d87ae3ce794939174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463f91dce16578829bc0593d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 15 23:20:49 2014 +0400 svchost: Simplify error handling, fix trace message. --- programs/svchost/svchost.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/programs/svchost/svchost.c b/programs/svchost/svchost.c index 573a6a3..8713b4a 100644 --- a/programs/svchost/svchost.c +++ b/programs/svchost/svchost.c @@ -254,6 +254,7 @@ static BOOL StartGroupServices(LPWSTR services) LPWSTR service_name = NULL; SERVICE_TABLE_ENTRYW *service_table = NULL; DWORD service_count; + BOOL ret; /* Count the services to load */ service_count = 0; @@ -264,8 +265,7 @@ static BOOL StartGroupServices(LPWSTR services) service_name = service_name + lstrlenW(service_name); ++service_name; } - WINE_TRACE("Service group %s contains %d services\n", - wine_dbgstr_w(services), service_count); + WINE_TRACE("Service group contains %d services\n", service_count); /* Populate the service table */ service_table = HeapAlloc(GetProcessHeap(), 0, @@ -287,15 +287,12 @@ static BOOL StartGroupServices(LPWSTR services) service_table[service_count].lpServiceProc = NULL; /* Start the services */ - if (!StartServiceCtrlDispatcherW(service_table)) - { + if (!(ret = StartServiceCtrlDispatcherW(service_table))) WINE_ERR("StartServiceCtrlDispatcherW failed to start %s: %u\n", wine_dbgstr_w(services), GetLastError()); - HeapFree(GetProcessHeap(), 0, service_table); - return FALSE; - } + HeapFree(GetProcessHeap(), 0, service_table); - return TRUE; + return ret; } /* Find the list of services associated with a group name and start those @@ -327,14 +324,11 @@ static BOOL LoadGroup(PWCHAR group_name) } /* Start services */ - if (StartGroupServices(services) == FALSE) - { + if (!(ret = StartGroupServices(services))) WINE_TRACE("Failed to start service group\n"); - HeapFree(GetProcessHeap(), 0, services); - return FALSE; - } + HeapFree(GetProcessHeap(), 0, services); - return TRUE; + return ret; } /* Load svchost group specified on the command line via the /k option */

1 0

Francois Gouget : testbot/testagentd: Fix the buffer reallocation in vformat_msg() on Windows.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: tools Branch: master Commit: 8c824018012b516a30a0094ee781a49ec3b67297 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8c824018012b516a30a0094e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Apr 16 18:34:09 2014 +0200 testbot/testagentd: Fix the buffer reallocation in vformat_msg() on Windows. On Windows vsnprintf() returns -1 if the buffer is too small, which we didn't detect because len was unsigned. --- testbot/src/testagentd/testagentd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 2aec9e9..4bda532 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -136,9 +136,9 @@ static int broken = 0; /* If true, then the server should exit */ static int quit = 0; -static char* vformat_msg(char** buf, unsigned* size, const char* format, va_list valist) +static char* vformat_msg(char** buf, int* size, const char* format, va_list valist) { - unsigned len; + int len; va_list args; len = 1; do @@ -161,7 +161,7 @@ static char* vformat_msg(char** buf, unsigned* size, const char* format, va_list return *buf; } -static char* format_msg(char** buf, unsigned* size, const char* format, ...) +static char* format_msg(char** buf, int* size, const char* format, ...) { va_list valist; va_start(valist, format); @@ -172,7 +172,7 @@ static char* format_msg(char** buf, unsigned* size, const char* format, ...) /* This is a message which indicates the reason for the status */ static char* status_msg = NULL; -static unsigned status_size = 0; +static int status_size = 0; static void vset_status_msg(const char* format, va_list valist) { vformat_msg(&status_msg, &status_size, format, valist); @@ -937,7 +937,7 @@ static void do_getproperties(SOCKET client) { const char* arch; char* buf = NULL; - unsigned size = 0; + int size = 0; if (!expect_list_size(client, 0)) {

1 0

Austin English : index.html: Update 1.6 references to 1.8.
by Alexandre Julliard 16 Apr '14

16 Apr '14

Module: bugzilla Branch: master Commit: 53d249de3ee25ff2cafa3e6e3bda50300b432fb2 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=53d249de3ee25ff2cafa3… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 16 02:39:38 2014 -0700 index.html: Update 1.6 references to 1.8. --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 79344e6..54e9b79 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,7 +23,7 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.6.0&order=bugs.bug_severity">Wine 1.6</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index f1bad5a..a099e31 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -150,8 +150,8 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.6.0&order=bugs.bug_severity">Wine 1.6</a> - These bugs are scheduled to be fixed before Wine 1.6 is released. + <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.8.0&order=bugs.bug_severity">Wine 1.8</a> + These bugs are scheduled to be fixed before Wine 1.8 is released. </li> <li><a href="//bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords=regression&keywords_type=anywords">Regressions</a>

1 0

Alexandre Julliard : user32: Load the message box font through the dialog template.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 7e874aed75765f3c017673178cfd64301b7ba3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e874aed75765f3c017673178… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 15 19:50:53 2014 +0200 user32: Load the message box font through the dialog template. --- dlls/user32/msgbox.c | 28 +++++----------------------- dlls/user32/user32.rc | 2 +- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 8b3cb4d..7fb17bd 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -61,9 +61,9 @@ static BOOL CALLBACK MSGBOX_EnumProc(HWND hwnd, LPARAM lParam) return TRUE; } -static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) +static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) { - HFONT hFont = 0, hPrevFont = 0; + HFONT hPrevFont; RECT rect; HWND hItem; HDC hdc; @@ -84,15 +84,6 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) nclm.cbSize = sizeof(nclm); SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0); - hFont = CreateFontIndirectW (&nclm.lfMessageFont); - /* set button font */ - for (i = IDOK; i <= IDCONTINUE; i++) - /* no close button */ - if (i != IDCLOSE) - SendDlgItemMessageW (hwnd, i, WM_SETFONT, (WPARAM)hFont, 0); - - /* set text font */ - SendDlgItemMessageW (hwnd, MSGBOX_IDTEXT, WM_SETFONT, (WPARAM)hFont, 0); if (!IS_INTRESOURCE(lpmb->lpszCaption)) { SetWindowTextW(hwnd, lpmb->lpszCaption); @@ -229,8 +220,7 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) iwidth = rect.right - ileft; hdc = GetDC(hwnd); - if (hFont) - hPrevFont = SelectObject(hdc, hFont); + hPrevFont = SelectObject( hdc, (HFONT)SendMessageW( hwnd, WM_GETFONT, 0, 0 )); /* Get the number of visible buttons and their size */ bh = bw = 1; /* Minimum button sizes */ @@ -270,8 +260,7 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) twidth = max((bw + bspace) * buttons + bspace - tleft, rect.right); theight = rect.bottom; - if (hFont) - SelectObject(hdc, hPrevFont); + SelectObject(hdc, hPrevFont); ReleaseDC(hwnd, hdc); tiheight = 16 + max(iheight, theight); @@ -319,7 +308,6 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); HeapFree( GetProcessHeap(), 0, buffer ); - return hFont; } @@ -331,15 +319,12 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - HFONT hFont; - switch(message) { case WM_INITDIALOG: { LPMSGBOXPARAMSW mbp = (LPMSGBOXPARAMSW)lParam; SetWindowContextHelpId(hwnd, mbp->dwContextHelpId); - hFont = MSGBOX_OnInit(hwnd, mbp); - SetPropA(hwnd, "WINE_MSGBOX_HFONT", hFont); + MSGBOX_OnInit(hwnd, mbp); SetPropA(hwnd, "WINE_MSGBOX_HELPCALLBACK", mbp->lpfnMsgBoxCallback); break; } @@ -356,10 +341,7 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message, case IDNO: case IDTRYAGAIN: case IDCONTINUE: - hFont = GetPropA(hwnd, "WINE_MSGBOX_HFONT"); EndDialog(hwnd, wParam); - if (hFont) - DeleteObject(hFont); break; case IDHELP: FIXME("Help button not supported yet\n"); diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index a031bfc..d281d53 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -72,7 +72,7 @@ STRINGTABLE } MSGBOX DIALOG 100, 80, 216, 168 -STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN ICON "", MSGBOX_IDICON, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", MSGBOX_IDTEXT, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX

1 0

Alexandre Julliard : wrc: Allow specifying the default message font in dialogs by setting DS_SETFONT.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Module: wine Branch: master Commit: 03167b43698ad49c9c2dd90fb927e96fb3af9aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03167b43698ad49c9c2dd90fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 15 19:50:11 2014 +0200 wrc: Allow specifying the default message font in dialogs by setting DS_SETFONT. --- tools/wrc/genres.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 61b2b29..9cea432 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -682,6 +682,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) } put_string(res, dlg->font->name, str_unicode, TRUE, dlg->lvc.language); } + else if (dlg->style->or_mask & DS_SETFONT) put_word( res, 0x7fff ); put_pad(res); while(ctrl)

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
50
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 April 2014