January 2009 - Wine-Commits

Henri Verbeet : d3d8: Properly test for dynamic usage in device_parent_CreateSurface().
by Alexandre Julliard Jan. 16, 2009

Jan. 16, 2009

Module: wine Branch: master Commit: b5eaca542e5e8265d535532c1c1c0a3c531de65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5eaca542e5e8265d535532c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 16 10:14:25 2009 +0100 d3d8: Properly test for dynamic usage in device_parent_CreateSurface(). --- dlls/d3d8/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6ee02a9..5ef6311 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2299,7 +2299,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen iface, superior, width, height, format, usage, pool, level, face, surface); - if (pool == WINED3DPOOL_DEFAULT && usage != WINED3DUSAGE_DYNAMIC) lockable = FALSE; + if (pool == WINED3DPOOL_DEFAULT && !(usage & WINED3DUSAGE_DYNAMIC)) lockable = FALSE; hr = IDirect3DDevice8Impl_CreateSurface((IDirect3DDevice8 *)This, width, height, format, lockable, FALSE /* Discard */, level, (IDirect3DSurface8 **)&d3d_surface,

1 0

Henri Verbeet : d3d10core: Add a small test for CreateTexture2D().
by Alexandre Julliard Jan. 16, 2009

Jan. 16, 2009

Module: wine Branch: master Commit: 558cc750c46737cab6dfbabc90d295ddb983a2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=558cc750c46737cab6dfbabc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 16 10:14:25 2009 +0100 d3d10core: Add a small test for CreateTexture2D(). --- dlls/d3d10core/tests/device.c | 48 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 2989893..5493d23 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -93,6 +93,53 @@ static void test_device_interfaces(ID3D10Device *device) ok(SUCCEEDED(hr), "ID3D10Device does not implement ID3D10Device\n"); } +static void test_create_texture(ID3D10Device *device) +{ + D3D10_TEXTURE2D_DESC desc; + ID3D10Texture2D *texture; + IDXGISurface *surface; + HRESULT hr; + + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + todo_wine ok(SUCCEEDED(hr), "Texture should implement IDXGISurface\n"); + if (SUCCEEDED(hr)) IDXGISurface_Release(surface); + ID3D10Texture2D_Release(texture); + + desc.MipLevels = 0; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(FAILED(hr), "Texture should not implement IDXGISurface\n"); + if (SUCCEEDED(hr)) IDXGISurface_Release(surface); + ID3D10Texture2D_Release(texture); + + desc.MipLevels = 1; + desc.ArraySize = 2; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(FAILED(hr), "Texture should not implement IDXGISurface\n"); + if (SUCCEEDED(hr)) IDXGISurface_Release(surface); + ID3D10Texture2D_Release(texture); +} + START_TEST(device) { ID3D10Device *device; @@ -106,6 +153,7 @@ START_TEST(device) } test_device_interfaces(device); + test_create_texture(device); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Henri Verbeet : dxgi: Add a small test for CreateSurface().
by Alexandre Julliard Jan. 16, 2009

Jan. 16, 2009

Module: wine Branch: master Commit: bd9320f8228972044754507ef011e82ff81296c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9320f8228972044754507ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 16 10:14:24 2009 +0100 dxgi: Add a small test for CreateSurface(). --- dlls/dxgi/tests/device.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 7603c14..39d780a 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -98,6 +98,29 @@ static void test_device_interfaces(IDXGIDevice *device) ok(SUCCEEDED(hr), "IDXGIDevice does not implement ID3D10Device\n"); } +static void test_create_surface(IDXGIDevice *device) +{ + ID3D10Texture2D *texture; + IDXGISurface *surface; + DXGI_SURFACE_DESC desc; + HRESULT hr; + + desc.Width = 512; + desc.Height = 512; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + + hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); + todo_wine ok(SUCCEEDED(hr), "Surface should implement ID3D10Texture2D\n"); + if (SUCCEEDED(hr)) ID3D10Texture2D_Release(texture); + + IDXGISurface_Release(surface); +} + START_TEST(device) { HMODULE d3d10core = LoadLibraryA("d3d10core.dll"); @@ -119,6 +142,7 @@ START_TEST(device) } test_device_interfaces(device); + test_create_surface(device); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Jeff Latimer : user32/tests: Clarify the msgs to differentiate Unicode and ASCII in tests.
by Alexandre Julliard Jan. 16, 2009

Jan. 16, 2009

Module: wine Branch: master Commit: f4ca7d2d1ae32af6886eb22d141d35cc8ded8d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ca7d2d1ae32af6886eb22d1… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Jan 16 11:40:31 2009 +1100 user32/tests: Clarify the msgs to differentiate Unicode and ASCII in tests. --- dlls/user32/tests/dde.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 53b216f..f1d6388 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2180,8 +2180,10 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV char str[MAX_PATH]; static int msg_index = 0; static HCONV conversation = 0; - static char test_cmd[] = "test dde command"; - static WCHAR test_cmd_w[] = {'t','e','s','t',' ','d','d','e',' ','c','o','m','m','a','n','d',0}; + static char test_cmd_w_to_a[] = "test dde command"; + static char test_cmd_a_to_a[] = "Test dde command"; + static WCHAR test_cmd_w_to_w[] = {'t','e','s','t',' ','d','d','e',' ','c','o','m','m','a','n','d',0}; + static WCHAR test_cmd_a_to_w[] = {'T','e','s','t',' ','d','d','e',' ','c','o','m','m','a','n','d',0}; static char test_service [] = "TestDDEService"; static char test_topic [] = "TestDDETopic"; @@ -2274,14 +2276,14 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV size, rsize, msg_index); if (msg_index == 10 || msg_index == 16) todo_wine { - ok(!lstrcmpW((WCHAR*)buffer, test_cmd_w), + ok(!lstrcmpW((WCHAR*)buffer, test_cmd_a_to_w), "Expected \"Test dde command\", msg_index=%d\n", msg_index); ok(size == 34, "Expected 34, got %d, msg_index=%d\n", size, msg_index); } else { - ok(!lstrcmpW((WCHAR*)buffer, test_cmd_w), - "Expected \"Test dde command\", msg_index=%d\n", + ok(!lstrcmpW((WCHAR*)buffer, test_cmd_w_to_w), + "Expected \"test dde command\", msg_index=%d\n", msg_index); ok(size == 34, "Expected 34, got %d, msg_index=%d\n", size, msg_index); } @@ -2295,16 +2297,22 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV size, rsize, msg_index); if (msg_index == 5) todo_wine { - ok(!lstrcmpA((CHAR*)buffer, test_cmd), "Expected %s, got %s, msg_index=%d\n", - test_cmd, buffer, msg_index); + ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n", + test_cmd_w_to_a, buffer, msg_index); ok(size == 17, "Expected size should be 17, got %d, msg_index=%d\n", size, msg_index); } - else + else if (msg_index == 23) { - ok(!lstrcmpA((CHAR*)buffer, test_cmd), "Expected %s, got %s, msg_index=%d\n", - test_cmd, buffer, msg_index); + ok(!lstrcmpA((CHAR*)buffer, test_cmd_w_to_a), "Expected %s, got %s, msg_index=%d\n", + test_cmd_w_to_a, buffer, msg_index); ok(size == 17, "Expected size should be 17, got %d, msg_index=%d\n", size, msg_index); } + else + { + ok(!lstrcmpA((CHAR*)buffer, test_cmd_a_to_a), "Expected %s, got %s, msg_index=%d\n", + test_cmd_a_to_a, buffer, msg_index); + ok(size == 17, "Expected size should be 17, got %d, msg_index=%d\n", size, msg_index); + } } @@ -2343,14 +2351,14 @@ static void test_end_to_end_client(BOOL type_a) HSZ server, topic; HCONV hconv; HDDEDATA hdata; - static char test_cmd[] = "test dde command"; + static char test_cmd[] = "Test dde command"; static WCHAR test_cmd_w[] = {'t','e','s','t',' ','d','d','e',' ','c','o','m','m','a','n','d',0}; static char test_service[] = "TestDDEService"; static WCHAR test_service_w[] = {'T','e','s','t','D','D','E','S','e','r','v','i','c','e',0}; static char test_topic[] = "TestDDETopic"; static WCHAR test_topic_w[] = {'T','e','s','t','D','D','E','T','o','p','i','c',0}; - trace("Start end to end client %d\n", type_a); + trace("Start end to end client %s\n", type_a ? "ASCII" : "UNICODE"); if (type_a) ret = DdeInitializeA(&client_pid, client_end_to_end_callback, APPCMD_CLIENTONLY, 0); @@ -2408,7 +2416,7 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) HDDEDATA hdata; static CHAR test_service[] = "TestDDEService"; - trace("start end to end server %d\n", type_a); + trace("start end to end server %s\n", type_a ? "ASCII" : "UNICODE"); server_pid = 0; if (type_a)

1 0

Ge van Geldorp : shell32/tests: Prevent crash on XP/W2K3.
by Alexandre Julliard Jan. 16, 2009

Jan. 16, 2009

Module: wine Branch: master Commit: c2a2c429b18cf3dfc65edc6fff40a06b2dec458e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a2c429b18cf3dfc65edc6ff… Author: Ge van Geldorp <ge(a)gse.nl> Date: Thu Jan 15 13:07:41 2009 +0100 shell32/tests: Prevent crash on XP/W2K3. --- dlls/shell32/tests/shlfileop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index e6d3287..433a131 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -513,7 +513,7 @@ static void test_delete(void) shfo.hwnd = NULL; shfo.wFunc = FO_DELETE; shfo.pFrom = buf; - shfo.pTo = "\0"; + shfo.pTo = NULL; shfo.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_SILENT; shfo.hNameMappings = NULL; shfo.lpszProgressTitle = NULL;

1 0

Michael Stefaniuc : dplayx: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 16, 2009

Jan. 16, 2009

Module: wine Branch: master Commit: f1a877a69d5a843c3cd807c1da42f7b0a92be748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1a877a69d5a843c3cd807c1d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 16 09:53:59 2009 +0100 dplayx: Remove superfluous pointer casts. --- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dplay.c | 53 ++++++++++++++++----------------- dlls/dplayx/dplaysp.c | 48 +++++++++++++++--------------- dlls/dplayx/dplayx_global.c | 10 +++--- dlls/dplayx/dplayx_messages.c | 8 ++-- dlls/dplayx/dplobby.c | 64 +++++++++++++++++++--------------------- dlls/dplayx/lobbysp.c | 12 ++++---- dlls/dplayx/name_server.c | 2 +- 8 files changed, 97 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1a877a69d5a843c3cd80…

1 0

Henri Verbeet : wined3d: Add an IWineD3DDeviceParent interface.
by Alexandre Julliard Jan. 16, 2009

Jan. 16, 2009

Module: wine Branch: master Commit: a966293f593e8b75e796a0a923626a1e73403a20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a966293f593e8b75e796a0a92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 16 10:14:24 2009 +0100 wined3d: Add an IWineD3DDeviceParent interface. Other than being a bit nicer than passing function pointers all over the place, this helps dxgi/d3d10. While the swapchain itself is created in dxgi, its surfaces are constructed in d3d10core, which makes it impractical for dxgi to pass the appropriate function pointers. --- dlls/d3d10core/d3d10core_main.c | 2 + dlls/d3d10core/d3d10core_private.h | 7 + dlls/d3d10core/device.c | 100 +++++++ dlls/d3d8/d3d8_private.h | 22 +-- dlls/d3d8/device.c | 282 ++++++++++++++++--- dlls/d3d8/directx.c | 104 +------- dlls/d3d8/volume.c | 38 +--- dlls/d3d9/cubetexture.c | 3 +- dlls/d3d9/d3d9_private.h | 27 +-- dlls/d3d9/device.c | 271 ++++++++++++++++-- dlls/d3d9/directx.c | 107 +------- dlls/d3d9/swapchain.c | 3 +- dlls/d3d9/texture.c | 3 +- dlls/d3d9/volume.c | 38 +--- dlls/d3d9/volumetexture.c | 7 +- dlls/ddraw/ddraw.c | 554 +++++++++++++++++------------------- dlls/ddraw/ddraw_private.h | 7 +- dlls/ddraw/main.c | 12 +- dlls/ddraw/parent.c | 2 - dlls/dxgi/dxgi_main.c | 34 ++- dlls/dxgi/dxgi_private.h | 2 +- dlls/wined3d/device.c | 116 ++++----- dlls/wined3d/directx.c | 9 +- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 93 +++++-- 25 files changed, 1032 insertions(+), 812 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a966293f593e8b75e796a…

1 0

Dylan Smith : richedit: Respect the cbSize field on EM_GETPARAFORMAT.
by Alexandre Julliard Jan. 16, 2009

Jan. 16, 2009

Module: wine Branch: master Commit: f73a34647f4cfb01022a0c3e9f918e46555787c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73a34647f4cfb01022a0c3e9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 15 23:50:20 2009 -0500 richedit: Respect the cbSize field on EM_GETPARAFORMAT. EM_GETPARAFORMAT previously would overwrite the cbSize field with the size of PARAFORMAT2, would read past the end of the struct, and might indicate that PARAFORMAT2 fields are valid using the mask regardless of the value of cbSize. --- dlls/riched20/para.c | 87 ++++++++++++++++++++++++------------------------- 1 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index a118d7d..ecc89d3 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -555,74 +555,73 @@ BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) return TRUE; } -static void ME_GetParaFormat(ME_TextEditor *editor, const ME_DisplayItem *para, PARAFORMAT2 *pFmt) +static void ME_GetParaFormat(ME_TextEditor *editor, + const ME_DisplayItem *para, + PARAFORMAT2 *pFmt) { - if (pFmt->cbSize >= sizeof(PARAFORMAT2)) - { + UINT cbSize = pFmt->cbSize; + if (pFmt->cbSize >= sizeof(PARAFORMAT2)) { *pFmt = *para->member.para.pFmt; - return; + } else { + CopyMemory(pFmt, para->member.para.pFmt, pFmt->cbSize); + pFmt->dwMask &= PFM_ALL; } - CopyMemory(pFmt, para->member.para.pFmt, pFmt->cbSize); + pFmt->cbSize = cbSize; } void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) { ME_DisplayItem *para, *para_end; - PARAFORMAT2 tmp; - + PARAFORMAT2 *curFmt; + + if (pFmt->cbSize < sizeof(PARAFORMAT)) { + pFmt->dwMask = 0; + return; + } + ME_GetSelectionParas(editor, &para, &para_end); - + ME_GetParaFormat(editor, para, pFmt); - if (para == para_end) return; - + /* Invalidate values that change across the selected paragraphs. */ - do { - ZeroMemory(&tmp, sizeof(tmp)); - tmp.cbSize = sizeof(tmp); - ME_GetParaFormat(editor, para, &tmp); + while (para != para_end) + { + para = para->member.para.next_para; + curFmt = &para->member.para.pFmt; #define CHECK_FIELD(m, f) \ - if (pFmt->f != tmp.f) pFmt->dwMask &= ~(m); + if (pFmt->f != curFmt->f) pFmt->dwMask &= ~(m); - pFmt->dwMask &= ~((pFmt->wEffects ^ tmp.wEffects) << 16); - CHECK_FIELD(PFM_NUMBERING, wNumbering); - assert(tmp.dwMask & PFM_ALIGNMENT); CHECK_FIELD(PFM_NUMBERING, wNumbering); - assert(tmp.dwMask & PFM_STARTINDENT); CHECK_FIELD(PFM_STARTINDENT, dxStartIndent); - assert(tmp.dwMask & PFM_RIGHTINDENT); CHECK_FIELD(PFM_RIGHTINDENT, dxRightIndent); - assert(tmp.dwMask & PFM_OFFSET); CHECK_FIELD(PFM_OFFSET, dxOffset); CHECK_FIELD(PFM_ALIGNMENT, wAlignment); - - assert(tmp.dwMask & PFM_TABSTOPS); if (pFmt->dwMask & PFM_TABSTOPS) { - if (pFmt->cTabCount != tmp.cTabCount || - memcmp(pFmt->rgxTabs, tmp.rgxTabs, tmp.cTabCount*sizeof(int))) + if (pFmt->cTabCount != para->member.para.pFmt->cTabCount || + memcmp(pFmt->rgxTabs, curFmt->rgxTabs, curFmt->cTabCount*sizeof(int))) pFmt->dwMask &= ~PFM_TABSTOPS; } - CHECK_FIELD(PFM_SPACEBEFORE, dySpaceBefore); - CHECK_FIELD(PFM_SPACEAFTER, dySpaceAfter); - CHECK_FIELD(PFM_LINESPACING, dyLineSpacing); - CHECK_FIELD(PFM_STYLE, sStyle); - CHECK_FIELD(PFM_SPACEAFTER, bLineSpacingRule); - CHECK_FIELD(PFM_SHADING, wShadingWeight); - CHECK_FIELD(PFM_SHADING, wShadingStyle); - CHECK_FIELD(PFM_NUMBERINGSTART, wNumberingStart); - CHECK_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); - CHECK_FIELD(PFM_NUMBERINGTAB, wNumberingTab); - CHECK_FIELD(PFM_BORDER, wBorderSpace); - CHECK_FIELD(PFM_BORDER, wBorderWidth); - CHECK_FIELD(PFM_BORDER, wBorders); - + if (pFmt->dwMask >= sizeof(PARAFORMAT2)) + { + pFmt->dwMask &= ~((pFmt->wEffects ^ curFmt->wEffects) << 16); + CHECK_FIELD(PFM_SPACEBEFORE, dySpaceBefore); + CHECK_FIELD(PFM_SPACEAFTER, dySpaceAfter); + CHECK_FIELD(PFM_LINESPACING, dyLineSpacing); + CHECK_FIELD(PFM_STYLE, sStyle); + CHECK_FIELD(PFM_SPACEAFTER, bLineSpacingRule); + CHECK_FIELD(PFM_SHADING, wShadingWeight); + CHECK_FIELD(PFM_SHADING, wShadingStyle); + CHECK_FIELD(PFM_NUMBERINGSTART, wNumberingStart); + CHECK_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); + CHECK_FIELD(PFM_NUMBERINGTAB, wNumberingTab); + CHECK_FIELD(PFM_BORDER, wBorderSpace); + CHECK_FIELD(PFM_BORDER, wBorderWidth); + CHECK_FIELD(PFM_BORDER, wBorders); + } #undef CHECK_FIELD - - if (para == para_end) - return; - para = para->member.para.next_para; - } while(1); + } } void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt)

1 0

Dylan Smith : richedit: Prevent copying PARAFORMAT2 fields from PARAFORMAT struct.
by Alexandre Julliard Jan. 16, 2009

Jan. 16, 2009

Module: wine Branch: master Commit: 1181bb762f8b1492e236320fd247ec173085b004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1181bb762f8b1492e236320fd… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 15 23:07:15 2009 -0500 richedit: Prevent copying PARAFORMAT2 fields from PARAFORMAT struct. If a EM_SETPARAFORMAT message is sent to the richedit control with bits in the dwMask field that correspond to PARAFORMAT2 fields, then these fields should be ignored. Instead data was copied from outside of the structure. --- dlls/riched20/para.c | 77 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 46 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 23d17f4..a118d7d 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -126,56 +126,71 @@ static void ME_UpdateTableFlags(ME_DisplayItem *para) static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFORMAT2 *pFmt) { PARAFORMAT2 copy; - assert(sizeof(*para->member.para.pFmt) == sizeof(PARAFORMAT2)); + DWORD dwMask; + + assert(para->member.para.pFmt->cbSize == sizeof(PARAFORMAT2)); + dwMask = pFmt->dwMask; + if (pFmt->cbSize < sizeof(PARAFORMAT)) + return FALSE; + else if (pFmt->cbSize < sizeof(PARAFORMAT2)) + dwMask &= PFM_ALL; + else + dwMask &= PFM_ALL2; + ME_AddUndoItem(editor, diUndoSetParagraphFormat, para); copy = *para->member.para.pFmt; #define COPY_FIELD(m, f) \ - if (pFmt->dwMask & (m)) { \ + if (dwMask & (m)) { \ para->member.para.pFmt->dwMask |= m; \ para->member.para.pFmt->f = pFmt->f; \ } COPY_FIELD(PFM_NUMBERING, wNumbering); -#define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \ - PFM_NOLINENUMBER|PFM_NOWIDOWCONTROL|PFM_DONOTHYPHEN|PFM_SIDEBYSIDE| \ - PFM_TABLE) - /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ - if (pFmt->dwMask & EFFECTS_MASK) { - para->member.para.pFmt->dwMask |= pFmt->dwMask & EFFECTS_MASK; - para->member.para.pFmt->wEffects &= ~HIWORD(pFmt->dwMask); - para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(pFmt->dwMask); - } -#undef EFFECTS_MASK - COPY_FIELD(PFM_STARTINDENT, dxStartIndent); - if (pFmt->dwMask & PFM_OFFSETINDENT) + if (dwMask & PFM_OFFSETINDENT) para->member.para.pFmt->dxStartIndent += pFmt->dxStartIndent; COPY_FIELD(PFM_RIGHTINDENT, dxRightIndent); COPY_FIELD(PFM_OFFSET, dxOffset); COPY_FIELD(PFM_ALIGNMENT, wAlignment); - - if (pFmt->dwMask & PFM_TABSTOPS) + if (dwMask & PFM_TABSTOPS) { para->member.para.pFmt->cTabCount = pFmt->cTabCount; memcpy(para->member.para.pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG)); } - COPY_FIELD(PFM_SPACEBEFORE, dySpaceBefore); - COPY_FIELD(PFM_SPACEAFTER, dySpaceAfter); - COPY_FIELD(PFM_LINESPACING, dyLineSpacing); - COPY_FIELD(PFM_STYLE, sStyle); - COPY_FIELD(PFM_LINESPACING, bLineSpacingRule); - COPY_FIELD(PFM_SHADING, wShadingWeight); - COPY_FIELD(PFM_SHADING, wShadingStyle); - COPY_FIELD(PFM_NUMBERINGSTART, wNumberingStart); - COPY_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); - COPY_FIELD(PFM_NUMBERINGTAB, wNumberingTab); - COPY_FIELD(PFM_BORDER, wBorderSpace); - COPY_FIELD(PFM_BORDER, wBorderWidth); - COPY_FIELD(PFM_BORDER, wBorders); - - para->member.para.pFmt->dwMask |= pFmt->dwMask; + + if (dwMask & (PFM_ALL2 & ~PFM_ALL)) + { + /* PARAFORMAT2 fields */ + +#define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \ + PFM_NOLINENUMBER|PFM_NOWIDOWCONTROL|PFM_DONOTHYPHEN|PFM_SIDEBYSIDE| \ + PFM_TABLE) + /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ + if (dwMask & EFFECTS_MASK) { + para->member.para.pFmt->dwMask |= dwMask & EFFECTS_MASK; + para->member.para.pFmt->wEffects &= ~HIWORD(dwMask); + para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(dwMask); + } +#undef EFFECTS_MASK + + COPY_FIELD(PFM_SPACEBEFORE, dySpaceBefore); + COPY_FIELD(PFM_SPACEAFTER, dySpaceAfter); + COPY_FIELD(PFM_LINESPACING, dyLineSpacing); + COPY_FIELD(PFM_STYLE, sStyle); + COPY_FIELD(PFM_LINESPACING, bLineSpacingRule); + COPY_FIELD(PFM_SHADING, wShadingWeight); + COPY_FIELD(PFM_SHADING, wShadingStyle); + COPY_FIELD(PFM_NUMBERINGSTART, wNumberingStart); + COPY_FIELD(PFM_NUMBERINGSTYLE, wNumberingStyle); + COPY_FIELD(PFM_NUMBERINGTAB, wNumberingTab); + COPY_FIELD(PFM_BORDER, wBorderSpace); + COPY_FIELD(PFM_BORDER, wBorderWidth); + COPY_FIELD(PFM_BORDER, wBorders); + } + + para->member.para.pFmt->dwMask |= dwMask; #undef COPY_FIELD if (memcmp(&copy, para->member.para.pFmt, sizeof(PARAFORMAT2)))

1 0

Dylan Smith : richedit: Store an internal copy of the window style flags.
by Alexandre Julliard Jan. 16, 2009

Jan. 16, 2009

Module: wine Branch: master Commit: 89f88a49a40905c0b1b977f802b4db741000041e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f88a49a40905c0b1b977f80… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 15 14:46:25 2009 -0500 richedit: Store an internal copy of the window style flags. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 60 +++++++++++++++++++++++------------------- dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 6 ++-- dlls/riched20/tests/editor.c | 12 ++++---- dlls/riched32/tests/editor.c | 4 +- 6 files changed, 46 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89f88a49a40905c0b1b97…

1 0