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

Rico Schüller : d3dx9: Introduce get_valid_parameter() .
by Alexandre Julliard July 20, 2011

July 20, 2011

Module: wine Branch: master Commit: f56af02f8ccdffb9f81c1f473b56315983082834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56af02f8ccdffb9f81c1f473… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 20 08:57:18 2011 +0200 d3dx9: Introduce get_valid_parameter(). --- dlls/d3dx9_36/effect.c | 100 ++++++++++++++++------------------------------- 1 files changed, 34 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f56af02f8ccdffb9f81c1…

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetTexture().
by Alexandre Julliard July 20, 2011

July 20, 2011

Module: wine Branch: master Commit: b0f2a49f42d2e4feafd659e497a2ab4f751aadaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f2a49f42d2e4feafd659e49… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 20 08:57:09 2011 +0200 d3dx9: Implement ID3DXBaseEffect::SetTexture(). --- dlls/d3dx9_36/effect.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0b0c436..88c6a16 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1988,10 +1988,30 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetString(ID3DXBaseEffect *iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_SetTexture(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, texture %p stub\n", This, parameter, texture); + TRACE("iface %p, parameter %p, texture %p\n", This, parameter, texture); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (texture && param && !param->element_count && + (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE)) + { + LPDIRECT3DBASETEXTURE9 oltexture = *(LPDIRECT3DBASETEXTURE9 *)param->data; + + if (texture) IDirect3DBaseTexture9_AddRef(texture); + if (oltexture) IDirect3DBaseTexture9_Release(oltexture); + + *(LPDIRECT3DBASETEXTURE9 *)param->data = texture; + + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetTexture(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 *texture)

1 0

Stefan Dösinger : wined3d: Don' t apply and invalidate the framebuffer when clearing the device's fb.
by Alexandre Julliard July 20, 2011

July 20, 2011

Module: wine Branch: master Commit: f99a2748e4d2ca540f774b09d10cb99c36bb61c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99a2748e4d2ca540f774b09d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 8 00:49:58 2011 +0200 wined3d: Don't apply and invalidate the framebuffer when clearing the device's fb. --- dlls/wined3d/context.c | 70 ++++++++++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b760154..3d17691 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2073,43 +2073,60 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d UINT i; struct wined3d_surface **rts = fb->render_targets; - if (!context_validate_rt_config(rt_count, rts, fb->depth_stencil)) - return FALSE; - - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + if (isStateDirty(context, STATE_FRAMEBUFFER) || fb != &device->fb + || rt_count != device->adapter->gl_info.limits.buffers) { - context_validate_onscreen_formats(device, context, fb->depth_stencil); - - ENTER_GL(); + if (!context_validate_rt_config(rt_count, fb->render_targets, fb->depth_stencil)) + return FALSE; - if (!rt_count || surface_is_offscreen(rts[0])) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - for (i = 0; i < rt_count; ++i) + context_validate_onscreen_formats(device, context, fb->depth_stencil); + + ENTER_GL(); + + if (!rt_count || surface_is_offscreen(fb->render_targets[0])) { - context->blit_targets[i] = rts[i]; - if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) - rt_mask |= (1 << i); + for (i = 0; i < rt_count; ++i) + { + context->blit_targets[i] = rts[i]; + if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + rt_mask |= (1 << i); + } + while (i < context->gl_info->limits.buffers) + { + context->blit_targets[i] = NULL; + ++i; + } + context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, fb->depth_stencil, SFLAG_INTEXTURE); + glReadBuffer(GL_NONE); + checkGLcall("glReadBuffer"); } - while (i < context->gl_info->limits.buffers) + else { - context->blit_targets[i] = NULL; - ++i; + context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); + rt_mask = context_generate_rt_mask_from_surface(fb->render_targets[0]); } - context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, fb->depth_stencil, SFLAG_INTEXTURE); - glReadBuffer(GL_NONE); - checkGLcall("glReadBuffer"); + + LEAVE_GL(); + + /* If the framebuffer is not the device's fb the device's fb has to be reapplied + * next draw. Otherwise we could mark the framebuffer state clean here, once the + * state management allows this */ + context_invalidate_state(context, STATE_FRAMEBUFFER, device->StateTable); } else { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL, SFLAG_INDRAWABLE); - rt_mask = context_generate_rt_mask_from_surface(rts[0]); + rt_mask = context_generate_rt_mask_no_fbo(device, rts[0]); + } + } + else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && (!rt_count || surface_is_offscreen(fb->render_targets[0]))) + { + for (i = 0; i < rt_count; ++i) + { + if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) rt_mask |= (1 << i); } - - LEAVE_GL(); - - /* TODO: This is not necessary if the framebuffer is the device's current framebuffer */ - context_invalidate_state(context, STATE_FRAMEBUFFER, device->StateTable); } else { @@ -2121,6 +2138,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; + context_invalidate_state(context, STATE_FRAMEBUFFER, device->StateTable); } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetMatrix().
by Alexandre Julliard July 20, 2011

July 20, 2011

Module: wine Branch: master Commit: 66a820683e1c213c9ade07fb2c6a81b7713a3b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a820683e1c213c9ade07fb2… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 20 08:57:21 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetMatrix(). --- dlls/d3dx9_36/effect.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ea24d4b..fdb5859 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -880,6 +880,22 @@ static inline BOOL get_bool(void *data) return (*(DWORD *)data) ? TRUE : FALSE; } +static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) +{ + unsigned int i, k; + + for (i = 0; i < 4; ++i) + { + for (k = 0; k < 4; ++k) + { + if ((i < param->rows) && (k < param->columns)) + matrix->m[i][k] = get_float(param->type, (float *)param->data + i * param->columns + k); + else + matrix->m[i][k] = 0.0f; + } + } +} + static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameter *parameter, LPCSTR name) { UINT element; @@ -1835,10 +1851,35 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrix(ID3DXBaseEffect *iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p stub\n", This, parameter, matrix); + TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); - return E_NOTIMPL; + if (matrix && param && !param->element_count) + { + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + get_matrix(param, matrix); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix, UINT count)

1 0

Dan Kegel : riched20/tests: Add test for WB_ISDELIMITER.
by Alexandre Julliard July 20, 2011

July 20, 2011

Module: wine Branch: master Commit: dafd6fecd1dc5cd07e8bcbcbd2acff3798406eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dafd6fecd1dc5cd07e8bcbcbd… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Jul 18 08:43:48 2011 -0700 riched20/tests: Add test for WB_ISDELIMITER. --- dlls/riched20/tests/editor.c | 106 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index c0ad42f..6bc2d6b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -46,19 +46,32 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH], string3[MAX_PATH]; static HMODULE hmoduleRichEdit; -static HWND new_window(LPCTSTR lpClassName, DWORD dwStyle, HWND parent) { +static HWND new_window(LPCSTR lpClassName, DWORD dwStyle, HWND parent) { HWND hwnd; - hwnd = CreateWindow(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL + hwnd = CreateWindowA(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "class: %s, error: %d\n", lpClassName, (int) GetLastError()); return hwnd; } +static HWND new_windowW(LPCWSTR lpClassName, DWORD dwStyle, HWND parent) { + HWND hwnd; + hwnd = CreateWindowW(lpClassName, NULL, dwStyle|WS_POPUP|WS_HSCROLL|WS_VSCROLL + |WS_VISIBLE, 0, 0, 200, 60, parent, NULL, + hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", wine_dbgstr_w(lpClassName), (int) GetLastError()); + return hwnd; +} + static HWND new_richedit(HWND parent) { return new_window(RICHEDIT_CLASS, ES_MULTILINE, parent); } +static HWND new_richeditW(HWND parent) { + return new_windowW(RICHEDIT_CLASS20W, ES_MULTILINE, parent); +} + /* Keeps the window reponsive for the deley_time in seconds. * This is useful for debugging a test to see what is happening. */ static void keep_responsive(time_t delay_time) @@ -7034,6 +7047,93 @@ static void test_dialogmode(void) DestroyWindow(hwParent); } +static void test_EM_FINDWORDBREAK_W(void) +{ + static const struct { + WCHAR c; + BOOL isdelimiter; /* expected result of WB_ISDELIMITER */ + } delimiter_tests[] = { + {0x0a, FALSE}, /* newline */ + {0x0b, FALSE}, /* vertical tab mark */ + {0x0c, FALSE}, /* form feed */ + {0x0d, FALSE}, /* carriage return */ + {0x20, TRUE}, /* ANSI Space */ + {0x61, FALSE}, /* ASCII capital letter a */ + {0xa0, FALSE}, /* no-break space */ + {0x2000, FALSE}, /* en quad */ + {0x3000, FALSE}, /* Ideographic space */ + {0x1100, FALSE}, /* Hangul Choseong Kiyeok (G sound) Ordinary Letter*/ + {0x11ff, FALSE}, /* Hangul Jongseoung Kiyeok-Hieuh (Hard N sound) Ordinary Letter*/ + {0x115f, FALSE}, /* Hangul Choseong Filler (no sound, used with two letter Hangul words) Ordinary Letter */ + {0xac00, FALSE}, /* Hangul character GA*/ + {0xd7af, FALSE}, /* End of Hangul character chart */ + {0xf020, TRUE}, /* High Surrogate Space */ + {0xff20, FALSE}, /* MS private for CP_SYMBOL round trip? */ + {WCH_EMBEDDING, FALSE}, /* object replacement character*/ + }; + int i; + HWND hwndRichEdit = new_richeditW(NULL); + ok(IsWindowUnicode(hwndRichEdit), "window should be unicode\n"); + for (i = 0; i < sizeof(delimiter_tests)/sizeof(delimiter_tests[0]); i++) + { + WCHAR wbuf[2]; + int result; + + wbuf[0] = delimiter_tests[i].c; + wbuf[1] = 0; + SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)wbuf); + result = SendMessageW(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER,0); + if (wbuf[0] == 0x20 || wbuf[0] == 0xf020) + todo_wine + ok(result == delimiter_tests[i].isdelimiter, + "wanted ISDELIMITER_W(0x%x) %d, got %d\n", + delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); + else + ok(result == delimiter_tests[i].isdelimiter, + "wanted ISDELIMITER_W(0x%x) %d, got %d\n", + delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); + } + DestroyWindow(hwndRichEdit); +} + +static void test_EM_FINDWORDBREAK_A(void) +{ + static const struct { + WCHAR c; + BOOL isdelimiter; /* expected result of WB_ISDELIMITER */ + } delimiter_tests[] = { + {0x0a, FALSE}, /* newline */ + {0x0b, FALSE}, /* vertical tab mark */ + {0x0c, FALSE}, /* form feed */ + {0x0d, FALSE}, /* carriage return */ + {0x20, TRUE}, /* ANSI Space */ + {0x61, FALSE}, /* ASCII capital letter a */ + }; + int i; + HWND hwndRichEdit = new_richedit(NULL); + + ok(!IsWindowUnicode(hwndRichEdit), "window should not be unicode\n"); + for (i = 0; i < sizeof(delimiter_tests)/sizeof(delimiter_tests[0]); i++) + { + int result; + char buf[2]; + buf[0] = delimiter_tests[i].c; + buf[1] = 0; + SendMessageW(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)buf); + result = SendMessage(hwndRichEdit, EM_FINDWORDBREAK, WB_ISDELIMITER, 0); + if (buf[0] == 0x20) + todo_wine + ok(result == delimiter_tests[i].isdelimiter, + "wanted ISDELIMITER_A(0x%x) %d, got %d\n", + delimiter_tests[i].c, delimiter_tests[i].isdelimiter,result); + else + ok(result == delimiter_tests[i].isdelimiter, + "wanted ISDELIMITER_A(0x%x) %d, got %d\n", + delimiter_tests[i].c, delimiter_tests[i].isdelimiter, result); + } + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { BOOL ret; @@ -7090,6 +7190,8 @@ START_TEST( editor ) test_WM_GETDLGCODE(); test_zoom(); test_dialogmode(); + test_EM_FINDWORDBREAK_W(); + test_EM_FINDWORDBREAK_A(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Jay Yang : shell32: Make ISFHelper_fnCopyItems actually copy the items.
by Alexandre Julliard July 20, 2011

July 20, 2011

Module: wine Branch: master Commit: 872c07a967f374e5216911f28863e5166e245bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872c07a967f374e5216911f28… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Tue Jul 19 12:25:15 2011 -0400 shell32: Make ISFHelper_fnCopyItems actually copy the items. --- dlls/shell32/shfldr_fs.c | 48 +++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index c0e9ae5..969f18d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1383,13 +1383,15 @@ static HRESULT WINAPI ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) { - UINT i; + HRESULT ret=E_FAIL; IPersistFolder2 *ppf2 = NULL; - char szSrcPath[MAX_PATH], - szDstPath[MAX_PATH]; - + WCHAR wszSrcPathRoot[MAX_PATH], + wszDstPath[MAX_PATH+1]; + WCHAR *wszSrcPathsList; IGenericSFImpl *This = impl_from_ISFHelper(iface); + SHFILEOPSTRUCTW fop; + TRACE ("(%p)->(%p,%u,%p)\n", This, pSFFrom, cidl, apidl); IShellFolder_QueryInterface (pSFFrom, &IID_IPersistFolder2, @@ -1398,24 +1400,32 @@ ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, LPITEMIDLIST pidl; if (SUCCEEDED (IPersistFolder2_GetCurFolder (ppf2, &pidl))) { - for (i = 0; i < cidl; i++) { - SHGetPathFromIDListA (pidl, szSrcPath); - PathAddBackslashA (szSrcPath); - _ILSimpleGetText (apidl[i], szSrcPath + strlen (szSrcPath), - MAX_PATH); - - if (!WideCharToMultiByte(CP_ACP, 0, This->sPathTarget, -1, szDstPath, MAX_PATH, NULL, NULL)) - szDstPath[0] = '\0'; - PathAddBackslashA (szDstPath); - _ILSimpleGetText (apidl[i], szDstPath + strlen (szDstPath), - MAX_PATH); - MESSAGE ("would copy %s to %s\n", szSrcPath, szDstPath); + SHGetPathFromIDListW (pidl, wszSrcPathRoot); + ZeroMemory(wszDstPath, MAX_PATH+1); + if (This->sPathTarget) + lstrcpynW(wszDstPath, This->sPathTarget, MAX_PATH); + PathAddBackslashW(wszSrcPathRoot); + PathAddBackslashW(wszDstPath); + wszSrcPathsList = build_paths_list(wszSrcPathRoot, cidl, apidl); + ZeroMemory(&fop, sizeof(fop)); + fop.hwnd = GetActiveWindow(); + fop.wFunc = FO_COPY; + fop.pFrom = wszSrcPathsList; + fop.pTo = wszDstPath; + fop.fFlags = FOF_ALLOWUNDO; + ret = S_OK; + if(SHFileOperationW(&fop)) + { + WARN("Copy failed\n"); + ret = E_FAIL; } - SHFree (pidl); + HeapFree(GetProcessHeap(), 0, wszSrcPathsList); + } - IPersistFolder2_Release (ppf2); + SHFree(pidl); + IPersistFolder2_Release(ppf2); } - return S_OK; + return ret; } static const ISFHelperVtbl shvt =

1 0

Bernhard Loos : server: Check for STATUS_OBJECT_TYPE_MISMATCH before STATUS_ACCESS_DENIED in get_handle_obj .
by Alexandre Julliard July 20, 2011

July 20, 2011

Module: wine Branch: master Commit: bf3c2a06f58a32cd58a019eff95774eea8305ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3c2a06f58a32cd58a019eff… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Tue Jul 19 13:20:39 2011 +0200 server: Check for STATUS_OBJECT_TYPE_MISMATCH before STATUS_ACCESS_DENIED in get_handle_obj. --- server/handle.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/handle.c b/server/handle.c index 9d91f16..c7cd417 100644 --- a/server/handle.c +++ b/server/handle.c @@ -403,14 +403,19 @@ struct object *get_handle_obj( struct process *process, obj_handle_t handle, set_error( STATUS_INVALID_HANDLE ); return NULL; } + obj = entry->ptr; + if (ops && (obj->ops != ops)) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); /* not the right type */ + return NULL; + } if ((entry->access & access) != access) { set_error( STATUS_ACCESS_DENIED ); return NULL; } - obj = entry->ptr; } - if (ops && (obj->ops != ops)) + else if (ops && (obj->ops != ops)) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); /* not the right type */ return NULL;

1 0

Dmitry Timoshkov : kernel32: Add a test how PE section characteristics get mapped into memory page access , make it pass under Wine.
by Alexandre Julliard July 20, 2011

July 20, 2011

Module: wine Branch: master Commit: 3d81e97c753a73646081b1084ad64c88b71f4cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d81e97c753a73646081b1084… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 20 01:41:12 2011 +0900 kernel32: Add a test how PE section characteristics get mapped into memory page access, make it pass under Wine. --- dlls/kernel32/tests/loader.c | 119 +++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/virtual.c | 2 +- 2 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 44dae18..d024074 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1,7 +1,7 @@ /* * Unit test suite for the PE loader. * - * Copyright 2006 Dmitry Timoshkov + * Copyright 2006,2011 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -560,8 +560,125 @@ static void test_ImportDescriptors(void) } } +static void test_section_access(void) +{ + static const struct test_data + { + DWORD scn_file_access, scn_page_access; + } td[] = + { + { 0, PAGE_NOACCESS }, + { IMAGE_SCN_MEM_READ, PAGE_READONLY }, + { IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, + { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } + }; + static const char filler[0x1000]; + static const char section_data[0x10] = "section data"; + int i; + DWORD dummy, file_align; + HANDLE hfile; + HMODULE hlib; + SYSTEM_INFO si; + char temp_path[MAX_PATH]; + char dll_name[MAX_PATH]; + SIZE_T size; + MEMORY_BASIC_INFORMATION info; + BOOL ret; + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + /* prevent displaying of the "Unable to load this DLL" message box */ + SetErrorMode(SEM_FAILCRITICALERRORS); + + GetTempPath(MAX_PATH, temp_path); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + GetTempFileName(temp_path, "ldr", 0, dll_name); + + /*trace("creating %s\n", dll_name);*/ + hfile = CreateFileA(dll_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + { + ok(0, "could not create %s\n", dll_name); + return; + } + + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &dos_header, sizeof(dos_header), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + + nt_header.FileHeader.NumberOfSections = 1; + nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + + nt_header.OptionalHeader.SectionAlignment = si.dwPageSize; + nt_header.OptionalHeader.FileAlignment = 0x200; + nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + si.dwPageSize; + nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &nt_header.OptionalHeader, sizeof(IMAGE_OPTIONAL_HEADER), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + + section.SizeOfRawData = sizeof(section_data); + section.PointerToRawData = nt_header.OptionalHeader.FileAlignment; + section.VirtualAddress = nt_header.OptionalHeader.SectionAlignment; + section.Misc.VirtualSize = section.SizeOfRawData; + section.Characteristics = td[i].scn_file_access; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &section, sizeof(section), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + + file_align = nt_header.OptionalHeader.FileAlignment - nt_header.OptionalHeader.SizeOfHeaders; + assert(file_align < sizeof(filler)); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, filler, file_align, &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + + /* section data */ + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, section_data, sizeof(section_data), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + + CloseHandle(hfile); + + SetLastError(0xdeadbeef); + hlib = LoadLibrary(dll_name); + ok(ret, "LoadLibrary error %d\n", GetLastError()); + + size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), + "%d: VirtualQuery error %d\n", i, GetLastError()); + ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + if (info.Protect != PAGE_NOACCESS) + ok(!memcmp((const char *)info.BaseAddress, section_data, section.SizeOfRawData), "wrong section data\n"); + + SetLastError(0xdeadbeef); + ret = FreeLibrary(hlib); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DeleteFile(dll_name); + ok(ret, "DeleteFile error %d\n", GetLastError()); + } +} + START_TEST(loader) { test_Loader(); test_ImportDescriptors(); + test_section_access(); } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index aba9a71..a7679da 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1341,7 +1341,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz size = ROUND_SIZE( sec->VirtualAddress, sec->SizeOfRawData ); if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; - if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ|VPROT_WRITE; + if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_WRITECOPY; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; /* Dumb game crack lets the AOEP point into a data section. Adjust. */

1 0

Vincent Povirk : shell32: Include NULL terminators in the lengths used by SHELL_ArgifyW.
by Alexandre Julliard July 20, 2011

July 20, 2011

Module: wine Branch: master Commit: eeeca57072f87d3796a030fba1d690915da6ebc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeeca57072f87d3796a030fba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 19 13:22:07 2011 -0500 shell32: Include NULL terminators in the lengths used by SHELL_ArgifyW. --- dlls/shell32/shlexec.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ff07550..7bbbb2b 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -269,7 +269,12 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp } } - *res = '\0'; + used ++; + if (res - out < len) + *res = '\0'; + else + out[len-1] = '\0'; + TRACE("used %i of %i space\n",used,len); if (out_len) *out_len = used;

1 0

Alexandre Julliard : gdi32: Add a special case for converting dibs to 1-bpp using the background color .
by Alexandre Julliard July 20, 2011

July 20, 2011

Module: wine Branch: master Commit: 07528a24b9d93caf7fcac068a97d9971b144a515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07528a24b9d93caf7fcac068a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 19 20:06:32 2011 +0200 gdi32: Add a special case for converting dibs to 1-bpp using the background color. --- dlls/gdi32/dibdrv/primitives.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index f2908e8..e1e9aca 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -692,6 +692,14 @@ static DWORD colorref_to_pixel_colortable(const dib_info *dib, COLORREF color) rgb.rgbGreen = GetGValue(color); rgb.rgbBlue = GetBValue(color); + /* special case for conversion to 1-bpp without a color table: + * we get a 1-entry table containing the background color + */ + if (dib->bit_count == 1 && dib->color_table_size == 1) + return (rgb.rgbRed == dib->color_table[0].rgbRed && + rgb.rgbGreen == dib->color_table[0].rgbGreen && + rgb.rgbBlue == dib->color_table[0].rgbBlue); + for(i = 0; i < dib->color_table_size; i++) { RGBQUAD *cur = dib->color_table + i;

1 0