March 2008 - Wine-commits - list.winehq.org

Dan Hipschman : qmgr: Only have one BackgroundCopyManager per system.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 275f00f54d29682729d2286e2ddf8a5f0c74d6e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275f00f54d29682729d2286e2… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Mar 6 19:04:35 2008 -0800 qmgr: Only have one BackgroundCopyManager per system. --- dlls/qmgr/enum_jobs.c | 4 ++ dlls/qmgr/qmgr.c | 57 +++++-------------------- dlls/qmgr/qmgr.h | 2 +- dlls/qmgr/tests/qmgr.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 120 insertions(+), 49 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index e35730a..85aca47 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -181,6 +181,8 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, /* Create array of jobs */ This->indexJobs = 0; + + EnterCriticalSection(&qmgr->cs); This->numJobs = list_count(&qmgr->jobs); if (0 < This->numJobs) @@ -189,6 +191,7 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, This->numJobs * sizeof *This->jobs); if (!This->jobs) { + LeaveCriticalSection(&qmgr->cs); HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } @@ -203,6 +206,7 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, IBackgroundCopyJob_AddRef(iJob); This->jobs[i++] = iJob; } + LeaveCriticalSection(&qmgr->cs); *ppObj = &This->lpVtbl; return S_OK; diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index fdfd30c..c6fbc42 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -1,7 +1,7 @@ /* * Queue Manager (BITS) core functions * - * Copyright 2007 Google (Roy Shea) + * Copyright 2007, 2008 Google (Roy Shea, Dan Hipschman) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,29 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -/* Destructor for instances of background copy manager */ -static void BackgroundCopyManagerDestructor(BackgroundCopyManagerImpl *This) -{ - BackgroundCopyJobImpl *job; - TRACE("%p\n", This); - - LIST_FOR_EACH_ENTRY(job, &This->jobs, BackgroundCopyJobImpl, entryFromQmgr) - job->lpVtbl->Release((IBackgroundCopyJob *) job); - - HeapFree(GetProcessHeap(), 0, This); -} - /* Add a reference to the iface pointer */ static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef( IBackgroundCopyManager* iface) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; - ULONG ref; - - TRACE("\n"); - - ref = InterlockedIncrement(&This->ref); - return ref; + return 2; } /* Attempt to provide a new interface to interact with iface */ @@ -74,17 +56,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface( static ULONG WINAPI BITS_IBackgroundCopyManager_Release( IBackgroundCopyManager* iface) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; - ULONG ref; - - TRACE("\n"); - - ref = InterlockedDecrement(&This->ref); - if (ref == 0) - { - BackgroundCopyManagerDestructor(This); - } - return ref; + return 1; } /*** IBackgroundCopyManager interface methods ***/ @@ -109,7 +81,9 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( /* Add a reference to the job to job list */ IBackgroundCopyJob_AddRef(*ppJob); job = (BackgroundCopyJobImpl *) *ppJob; + EnterCriticalSection(&This->cs); list_add_head(&This->jobs, &job->entryFromQmgr); + LeaveCriticalSection(&This->cs); return S_OK; } @@ -153,23 +127,16 @@ static const IBackgroundCopyManagerVtbl BITS_IBackgroundCopyManager_Vtbl = BITS_IBackgroundCopyManager_GetErrorDescription }; +static BackgroundCopyManagerImpl globalMgr = { + &BITS_IBackgroundCopyManager_Vtbl, + { NULL, -1, 0, 0, 0, 0 }, + LIST_INIT(globalMgr.jobs) +}; + /* Constructor for instances of background copy manager */ HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) { - BackgroundCopyManagerImpl *This; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); - - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - if (!This) - { - return E_OUTOFMEMORY; - } - - This->lpVtbl = &BITS_IBackgroundCopyManager_Vtbl; - This->ref = 1; - list_init(&This->jobs); - - *ppObj = &This->lpVtbl; + *ppObj = (IBackgroundCopyManager *) &globalMgr; return S_OK; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index f40b1a5..166ee40 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -78,7 +78,7 @@ typedef struct typedef struct { const IBackgroundCopyManagerVtbl *lpVtbl; - LONG ref; + CRITICAL_SECTION cs; struct list jobs; } BackgroundCopyManagerImpl; diff --git a/dlls/qmgr/tests/qmgr.c b/dlls/qmgr/tests/qmgr.c index 07af527..8c95586 100644 --- a/dlls/qmgr/tests/qmgr.c +++ b/dlls/qmgr/tests/qmgr.c @@ -26,6 +26,8 @@ #include "initguid.h" #include "bits.h" +static WCHAR progname[MAX_PATH]; + static void test_CreateInstance(void) { @@ -130,11 +132,109 @@ static void test_EnumJobs(void) IBackgroundCopyManager_Release(manager); } +static void run_child(WCHAR *secret) +{ + static const WCHAR format[] = {'%','s',' ','q','m','g','r',' ','%','s', 0}; + WCHAR cmdline[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOW startup; + + memset(&startup, 0, sizeof startup); + startup.cb = sizeof startup; + + wsprintfW(cmdline, format, progname, secret); + ok(CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + winetest_wait_child_process(info.hProcess); + ok(CloseHandle(info.hProcess), "CloseHandle\n"); + ok(CloseHandle(info.hThread), "CloseHandle\n"); +} + +static void do_child(const char *secretA) +{ + WCHAR secretW[MAX_PATH]; + IBackgroundCopyManager *manager = NULL; + GUID id; + IBackgroundCopyJob *job; + HRESULT hres; + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, + CLSCTX_LOCAL_SERVER, &IID_IBackgroundCopyManager, + (void **) &manager); + if(hres != S_OK) + { + skip("Unable to create bits instance required for test.\n"); + return; + } + + MultiByteToWideChar(CP_ACP, 0, secretA, -1, secretW, MAX_PATH); + hres = IBackgroundCopyManager_CreateJob(manager, secretW, + BG_JOB_TYPE_DOWNLOAD, &id, &job); + ok(hres == S_OK, "CreateJob in child process\n"); + IBackgroundCopyJob_Release(job); + IBackgroundCopyManager_Release(manager); +} + +static void test_globalness(void) +{ + static const WCHAR format[] = {'t','e','s','t','_','%','u', 0}; + WCHAR secretName[MAX_PATH]; + IEnumBackgroundCopyJobs* enumJobs; + IBackgroundCopyManager *manager = NULL; + HRESULT hres; + hres = CoCreateInstance(&CLSID_BackgroundCopyManager, NULL, + CLSCTX_LOCAL_SERVER, &IID_IBackgroundCopyManager, + (void **) &manager); + if(hres != S_OK) + { + skip("Unable to create bits instance required for test.\n"); + return; + } + + wsprintfW(secretName, format, GetTickCount()); + run_child(secretName); + + hres = IBackgroundCopyManager_EnumJobs(manager, 0, &enumJobs); + ok(hres == S_OK, "EnumJobs failed: %08x\n", hres); + if(hres != S_OK) + skip("Unable to create job enumerator.\n"); + else + { + ULONG i, n; + IBackgroundCopyJob *job; + BOOL found = FALSE; + + hres = IEnumBackgroundCopyJobs_GetCount(enumJobs, &n); + for (i = 0; i < n && !found; ++i) + { + LPWSTR name; + IEnumBackgroundCopyJobs_Next(enumJobs, 1, &job, NULL); + IBackgroundCopyJob_GetDisplayName(job, &name); + if (lstrcmpW(name, secretName) == 0) + found = TRUE; + CoTaskMemFree(name); + IBackgroundCopyJob_Release(job); + } + hres = IEnumBackgroundCopyJobs_Release(enumJobs); + ok(found, "Adding a job in another process failed\n"); + } + + IBackgroundCopyManager_Release(manager); +} + START_TEST(qmgr) { + char **argv; + int argc = winetest_get_mainargs(&argv); + MultiByteToWideChar(CP_ACP, 0, argv[0], -1, progname, MAX_PATH); + CoInitialize(NULL); - test_CreateInstance(); - test_CreateJob(); - test_EnumJobs(); + if (argc == 3) + do_child(argv[2]); + else + { + test_CreateInstance(); + test_CreateJob(); + test_EnumJobs(); + test_globalness(); + } CoUninitialize(); }

1 0

Stefan Dösinger : wined3d: gl_FragCoord isn't exact.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 8a3ef776f4f411172c5bfcc634f358dbedbc7479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3ef776f4f411172c5bfcc63… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 7 03:13:07 2008 +0100 wined3d: gl_FragCoord isn't exact. --- dlls/d3d9/tests/visual.c | 46 +++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/glsl_shader.c | 16 ++++++++++++++- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6b70a02..280e92d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6907,7 +6907,16 @@ static void vpos_register_test(IDirect3DDevice9 *device) 0x02000001, 0x800f0800, 0x80e40002, /* mov oC0, r2 */ 0x0000ffff /* end */ }; - IDirect3DPixelShader9 *shader; + const DWORD shader_frac_code[] = { + 0xffff0300, /* ps_3_0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, /* def c0, 0.0, 0.0, 0.0, 0.0 */ + 0x0200001f, 0x80000000, 0x90031000, /* dcl vPos.xy */ + 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x02000013, 0x80030000, 0x90541000, /* frc r0.xy, vPos.xy */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff /* end */ + }; + IDirect3DPixelShader9 *shader, *shader_frac; IDirect3DSurface9 *surface = NULL, *backbuffer; const float quad[] = { -1.0, -1.0, 0.1, 0.0, 0.0, @@ -6923,6 +6932,8 @@ static void vpos_register_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_CreatePixelShader(device, shader_frac_code, &shader_frac); + ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed hr=%s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetPixelShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed hr=%s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); @@ -6967,8 +6978,6 @@ static void vpos_register_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed hr=%s\n", DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%s\n", DXGetErrorString9(hr)); } hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, D3DLOCK_READONLY); ok(hr == D3D_OK, "IDirect3DSurface9_LockRect failed, hr=%s\n", DXGetErrorString9(hr)); @@ -6989,7 +6998,38 @@ static void vpos_register_test(IDirect3DDevice9 *device) hr = IDirect3DSurface9_UnlockRect(surface); ok(hr == D3D_OK, "IDirect3DSurface9_UnlockRect failed, hr=%s\n", DXGetErrorString9(hr)); + /* Test the fraction value of vPos. This is tested with the offscreen target and not the backbuffer to + * have full control over the multisampling setting inside this test + */ + hr = IDirect3DDevice9_SetPixelShader(device, shader_frac); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed hr=%s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(float) * 5); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed hr=%s\n", DXGetErrorString9(hr)); + } + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "IDirect3DSurface9_LockRect failed, hr=%s\n", DXGetErrorString9(hr)); + + pos = (DWORD *) (((BYTE *) lr.pBits) + 14 * lr.Pitch + 14 * sizeof(DWORD)); + color = *pos & 0x00ffffff; + ok(color == 0x00000000, "vPos fraction test has color 0x%08x, expected 0x00000000\n", color); + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3D_OK, "IDirect3DSurface9_UnlockRect failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed hr=%s\n", DXGetErrorString9(hr)); IDirect3DPixelShader9_Release(shader); + IDirect3DPixelShader9_Release(shader_frac); if(surface) IDirect3DSurface9_Release(surface); IDirect3DSurface9_Release(backbuffer); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 61b21fa..5a0b7c5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -706,7 +706,21 @@ void shader_generate_glsl_declarations( /* Start the main program */ shader_addline(buffer, "void main() {\n"); if(pshader && reg_maps->vpos) { - shader_addline(buffer, "vpos = vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1) - 0.5;\n"); + /* DirectX apps expect integer values, while OpenGL drivers add approximately 0.5. This causes + * off-by-one problems as spotted by the vPos d3d9 visual test. Unfortunately the ATI cards do + * not add exactly 0.5, but rather something like 0.49999999 or 0.50000001, which still causes + * precision troubles when we just substract 0.5. + * + * To deal with that just floor() the position. This will eliminate the fraction on all cards. + * + * TODO: Test how that behaves with multisampling once we can enable multisampling in winex11. + * + * An advantage of floor is that it works even if the driver doesn't add 1/2. It is somewhat + * questionable if 1.5, 2.5, ... are the proper values to return in gl_FragCoord, even though + * coordinates specify the pixel centers instead of the pixel corners. This code will behave + * correctly on drivers that returns integer values. + */ + shader_addline(buffer, "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); } }

1 0

Stefan Dösinger : wined3d: Mark constants dirty in the EXT_gpu_program_parameters path.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 20e57ea607a647ab119f6098627865979f3cab19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e57ea607a647ab119f60986… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 7 03:15:39 2008 +0100 wined3d: Mark constants dirty in the EXT_gpu_program_parameters path. --- dlls/wined3d/arb_program_shader.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b1e1712..8ddab49 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -100,8 +100,11 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl* This, Win if(!dirty_consts[i]) continue; /* Find the next block of dirty constants */ + dirty_consts[i] = 0; j = i; - for(i++; (i < max_constants) && dirty_consts[i]; i++); + for(i++; (i < max_constants) && dirty_consts[i]; i++) { + dirty_consts[i] = 0; + } GL_EXTCALL(glProgramEnvParameters4fvEXT(target_type, j, i - j, constants + (j * 4))); }

1 0

Stefan Dösinger : d3d9: Add a point size test.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 5f14acc0bf31762c62ac6be4394f091dd59b184a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f14acc0bf31762c62ac6be43… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 17 23:35:39 2008 +0100 d3d9: Add a point size test. --- dlls/d3d9/tests/visual.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f14acc0bf31762c62ac6…

1 0

Alexandre Julliard : user32: Force the window position to be on-screen in SetWindowPlacement.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: b7d103b634d676e46ef30434ae5f32ba840be155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d103b634d676e46ef30434a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 7 11:00:36 2008 +0100 user32: Force the window position to be on-screen in SetWindowPlacement. --- dlls/user32/winpos.c | 133 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 86 insertions(+), 47 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index e9422be..e216065 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1235,6 +1235,48 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) return TRUE; } +/* make sure the specified rect is visible on screen */ +static void make_rect_onscreen( RECT *rect ) +{ + MONITORINFO info; + HMONITOR monitor = MonitorFromRect( rect, MONITOR_DEFAULTTONEAREST ); + + info.cbSize = sizeof(info); + if (!monitor || !GetMonitorInfoW( monitor, &info )) return; + /* FIXME: map coordinates from rcWork to rcMonitor */ + if (rect->right <= info.rcWork.left) + { + rect->right += info.rcWork.left - rect->left; + rect->left = info.rcWork.left; + } + else if (rect->left >= info.rcWork.right) + { + rect->left += info.rcWork.right - rect->right; + rect->right = info.rcWork.right; + } + if (rect->bottom <= info.rcWork.top) + { + rect->bottom += info.rcWork.top - rect->top; + rect->top = info.rcWork.top; + } + else if (rect->top >= info.rcWork.bottom) + { + rect->top += info.rcWork.bottom - rect->bottom; + rect->bottom = info.rcWork.bottom; + } +} + +/* make sure the specified point is visible on screen */ +static void make_point_onscreen( POINT *pt ) +{ + RECT rect; + + SetRect( &rect, pt->x, pt->y, pt->x + 1, pt->y + 1 ); + make_rect_onscreen( &rect ); + pt->x = rect.left; + pt->y = rect.top; +} + /*********************************************************************** * WINPOS_SetPlacement @@ -1243,50 +1285,48 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f { DWORD style; WND *pWnd = WIN_GetPtr( hwnd ); - POINT pt; - RECT rect; + WINDOWPLACEMENT wp = *wndpl; - if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; + if (flags & PLACE_MIN) make_point_onscreen( &wp.ptMinPosition ); + if (flags & PLACE_MAX) make_point_onscreen( &wp.ptMaxPosition ); + if (flags & PLACE_RECT) make_rect_onscreen( &wp.rcNormalPosition ); - TRACE( "%p: setting min %d,%d max %d,%d normal %s flags %x\n", + TRACE( "%p: setting min %d,%d max %d,%d normal %s flags %x ajusted to min %d,%d max %d,%d normal %s\n", hwnd, wndpl->ptMinPosition.x, wndpl->ptMinPosition.y, wndpl->ptMaxPosition.x, wndpl->ptMaxPosition.y, - wine_dbgstr_rect(&wndpl->rcNormalPosition), flags ); + wine_dbgstr_rect(&wndpl->rcNormalPosition), flags, + wp.ptMinPosition.x, wp.ptMinPosition.y, wp.ptMaxPosition.x, wp.ptMaxPosition.y, + wine_dbgstr_rect(&wp.rcNormalPosition) ); - if( flags & PLACE_MIN ) pWnd->min_pos = wndpl->ptMinPosition; - if( flags & PLACE_MAX ) pWnd->max_pos = wndpl->ptMaxPosition; - if( flags & PLACE_RECT) pWnd->normal_rect = wndpl->rcNormalPosition; + if (!pWnd || pWnd == WND_OTHER_PROCESS || pWnd == WND_DESKTOP) return FALSE; - style = pWnd->dwStyle; - pt.x = pt.y = -1; - SetRectEmpty( &rect ); + if( flags & PLACE_MIN ) pWnd->min_pos = wp.ptMinPosition; + if( flags & PLACE_MAX ) pWnd->max_pos = wp.ptMaxPosition; + if( flags & PLACE_RECT) pWnd->normal_rect = wp.rcNormalPosition; - if( style & WS_MINIMIZE ) - { - if (wndpl->flags & WPF_SETMINPOSITION) pt = pWnd->min_pos; - } - else if( style & WS_MAXIMIZE ) - { - pt = pWnd->max_pos; - } - else if( flags & PLACE_RECT ) - rect = pWnd->normal_rect; + style = pWnd->dwStyle; WIN_ReleasePtr( pWnd ); if( style & WS_MINIMIZE ) { - WINPOS_ShowIconTitle( hwnd, FALSE ); - if (!EMPTYPOINT(pt)) SetWindowPos( hwnd, 0, pt.x, pt.y, 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + if (flags & PLACE_MIN) + { + WINPOS_ShowIconTitle( hwnd, FALSE ); + SetWindowPos( hwnd, 0, wp.ptMinPosition.x, wp.ptMinPosition.y, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + } } else if( style & WS_MAXIMIZE ) { - if (!EMPTYPOINT(pt)) SetWindowPos( hwnd, 0, pt.x, pt.y, 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + if (flags & PLACE_MAX) + SetWindowPos( hwnd, 0, wp.ptMaxPosition.x, wp.ptMaxPosition.y, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); } else if( flags & PLACE_RECT ) - SetWindowPos( hwnd, 0, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, + SetWindowPos( hwnd, 0, wp.rcNormalPosition.left, wp.rcNormalPosition.top, + wp.rcNormalPosition.right - wp.rcNormalPosition.left, + wp.rcNormalPosition.bottom - wp.rcNormalPosition.top, SWP_NOZORDER | SWP_NOACTIVATE ); ShowWindow( hwnd, wndpl->showCmd ); @@ -1318,8 +1358,10 @@ static BOOL WINPOS_SetPlacement( HWND hwnd, const WINDOWPLACEMENT *wndpl, UINT f */ BOOL WINAPI SetWindowPlacement( HWND hwnd, const WINDOWPLACEMENT *wpl ) { + UINT flags = PLACE_MAX | PLACE_RECT; if (!wpl) return FALSE; - return WINPOS_SetPlacement( hwnd, wpl, PLACE_MIN | PLACE_MAX | PLACE_RECT ); + if (wpl->flags & WPF_SETMINPOSITION) flags |= PLACE_MIN; + return WINPOS_SetPlacement( hwnd, wpl, flags ); } @@ -1354,28 +1396,25 @@ BOOL WINAPI AnimateWindow(HWND hwnd, DWORD dwTime, DWORD dwFlags) void WINAPI SetInternalWindowPos( HWND hwnd, UINT showCmd, LPRECT rect, LPPOINT pt ) { - if( IsWindow(hwnd) ) - { - WINDOWPLACEMENT wndpl; - UINT flags; + WINDOWPLACEMENT wndpl; + UINT flags; - wndpl.length = sizeof(wndpl); - wndpl.showCmd = showCmd; - wndpl.flags = flags = 0; + wndpl.length = sizeof(wndpl); + wndpl.showCmd = showCmd; + wndpl.flags = flags = 0; - if( pt ) - { - flags |= PLACE_MIN; - wndpl.flags |= WPF_SETMINPOSITION; - wndpl.ptMinPosition = *pt; - } - if( rect ) - { - flags |= PLACE_RECT; - wndpl.rcNormalPosition = *rect; - } - WINPOS_SetPlacement( hwnd, &wndpl, flags ); + if( pt ) + { + flags |= PLACE_MIN; + wndpl.flags |= WPF_SETMINPOSITION; + wndpl.ptMinPosition = *pt; + } + if( rect ) + { + flags |= PLACE_RECT; + wndpl.rcNormalPosition = *rect; } + WINPOS_SetPlacement( hwnd, &wndpl, flags ); }

1 0

Andrew Talbot : msvcrt: Assign to structs instead of using memcpy.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 32d7a9e66877bb36c2a94bd2f5f8180329c7e74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d7a9e66877bb36c2a94bd2f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 6 22:33:51 2008 +0000 msvcrt: Assign to structs instead of using memcpy. --- dlls/msvcrt/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c2539c2..0c1e84b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1220,13 +1220,13 @@ int CDECL _futime(int fd, struct MSVCRT__utimbuf *t) MSVCRT_time_t currTime; MSVCRT_time(&currTime); RtlSecondsSince1970ToTime(currTime, (LARGE_INTEGER *)&at); - memcpy(&wt, &at, sizeof(wt)); + wt = at; } else { RtlSecondsSince1970ToTime(t->actime, (LARGE_INTEGER *)&at); if (t->actime == t->modtime) - memcpy(&wt, &at, sizeof(wt)); + wt = at; else RtlSecondsSince1970ToTime(t->modtime, (LARGE_INTEGER *)&wt); }

1 0

Stefan Dösinger : d3d9: Add a test for the vPos register.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: c00c89eb51d8d8c0fabfcd5772d6b07c758e6790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c00c89eb51d8d8c0fabfcd577… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 7 03:09:51 2008 +0100 d3d9: Add a test for the vPos register. The vPos register returns the unnormalised position of the current fragment to the pixel shader. This test tests for its functionality in both onscreen and offscreen render targets. On- and offscreen targets are used because of the inverted y coordinate. --- dlls/d3d9/tests/visual.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 104 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cccb2fc..6b70a02 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6891,6 +6891,109 @@ static void stencil_cull_test(IDirect3DDevice9 *device) { ok(color == 0x00000080, "CW triangle, twoside TRUE, cull cw, culled, has color 0x%08x, expected 0x00000080\n", color); } +static void vpos_register_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + DWORD color; + const DWORD shader_code[] = { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000000, 0x90031000, /* dcl vPos.xy */ + 0x03000002, 0x80030000, 0x90541000, 0xa1fe0000, /* sub r0.xy, vPos.xy, c0.zw */ + 0x02000001, 0x800f0001, 0xa0e40000, /* mov r1, c0 */ + 0x02000001, 0x80080002, 0xa0550000, /* mov r2.a, c0.y */ + 0x02000001, 0x80010002, 0xa0550000, /* mov r2.r, c0.y */ + 0x04000058, 0x80020002, 0x80000000, 0x80000001, 0x80550001, /* cmp r2.g, r0.x, r1.x, r1.y */ + 0x04000058, 0x80040002, 0x80550000, 0x80000001, 0x80550001, /* cmp r2.b, r0.y, r1.x, r1.y */ + 0x02000001, 0x800f0800, 0x80e40002, /* mov oC0, r2 */ + 0x0000ffff /* end */ + }; + IDirect3DPixelShader9 *shader; + IDirect3DSurface9 *surface = NULL, *backbuffer; + const float quad[] = { + -1.0, -1.0, 0.1, 0.0, 0.0, + 1.0, -1.0, 0.1, 1.0, 0.0, + -1.0, 1.0, 0.1, 0.0, 1.0, + 1.0, 1.0, 0.1, 1.0, 1.0, + }; + D3DLOCKED_RECT lr; + float constant[4] = {1.0, 0.0, 320, 240}; + DWORD *pos; + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); + ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetPixelShader(device, shader); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3D_OK, "IDirect3DDevice9_GetBackBuffer failed hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed hr=%s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_SetPixelShaderConstantF(device, 0, constant, 1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShaderConstantF failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(float) * 5); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed hr=%s\n", DXGetErrorString9(hr)); + } + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + /* This has to be pixel exact */ + color = getPixelColor(device, 319, 239); + ok(color == 0x00000000, "vPos: Pixel 319,239 has color 0x%08x, expected 0x00000000\n", color); + color = getPixelColor(device, 320, 239); + ok(color == 0x0000ff00, "vPos: Pixel 320,239 has color 0x%08x, expected 0x0000ff00\n", color); + color = getPixelColor(device, 319, 240); + ok(color == 0x000000ff, "vPos: Pixel 319,240 has color 0x%08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 320, 240); + ok(color == 0x0000ffff, "vPos: Pixel 320,240 has color 0x%08x, expected 0x0000ffff\n", color); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, D3DFMT_X8R8G8B8, 0, 0, TRUE, + &surface, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateRenderTarget failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed hr=%s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + constant[2] = 16; constant[3] = 16; + hr = IDirect3DDevice9_SetPixelShaderConstantF(device, 0, constant, 1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShaderConstantF failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(float) * 5); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%s\n", DXGetErrorString9(hr)); + } + hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "IDirect3DSurface9_LockRect failed, hr=%s\n", DXGetErrorString9(hr)); + + pos = (DWORD *) (((BYTE *) lr.pBits) + 14 * lr.Pitch + 14 * sizeof(DWORD)); + color = *pos & 0x00ffffff; + ok(color == 0x00000000, "Pixel 14/14 has color 0x%08x, expected 0x00000000\n", color); + pos = (DWORD *) (((BYTE *) lr.pBits) + 14 * lr.Pitch + 18 * sizeof(DWORD)); + color = *pos & 0x00ffffff; + ok(color == 0x0000ff00, "Pixel 14/18 has color 0x%08x, expected 0x0000ff00\n", color); + pos = (DWORD *) (((BYTE *) lr.pBits) + 18 * lr.Pitch + 14 * sizeof(DWORD)); + color = *pos & 0x00ffffff; + ok(color == 0x000000ff, "Pixel 18/14 has color 0x%08x, expected 0x000000ff\n", color); + pos = (DWORD *) (((BYTE *) lr.pBits) + 18 * lr.Pitch + 18 * sizeof(DWORD)); + color = *pos & 0x00ffffff; + ok(color == 0x0000ffff, "Pixel 18/18 has color 0x%08x, expected 0x0000ffff\n", color); + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3D_OK, "IDirect3DSurface9_UnlockRect failed, hr=%s\n", DXGetErrorString9(hr)); + + IDirect3DPixelShader9_Release(shader); + if(surface) IDirect3DSurface9_Release(surface); + IDirect3DSurface9_Release(backbuffer); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -7019,6 +7122,7 @@ START_TEST(visual) nested_loop_test(device_ptr); fixed_function_varying_test(device_ptr); vFace_register_test(device_ptr); + vpos_register_test(device_ptr); if(caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { vshader_version_varying_test(device_ptr); pshader_version_varying_test(device_ptr);

1 0

Maarten Lankhorst : server: Fix reference leak in enum_desktop.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 8b164ce484e388e4e78fe16c658e52daec749367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b164ce484e388e4e78fe16c6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 6 14:57:28 2008 -0800 server: Fix reference leak in enum_desktop. --- server/winstation.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/winstation.c b/server/winstation.c index 3b163a7..9ad65f0 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -669,6 +669,7 @@ DECL_HANDLER(enum_desktop) { set_reply_data_obj_name( &desktop->obj ); release_object( desktop ); + release_object( winstation ); clear_error(); reply->next = index; return;

1 0

James Hawkins : msi: Fix handling of published installer properties.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: d52f48fed467885ede38accb7b164e7d5a139206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52f48fed467885ede38accb7… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 6 16:12:40 2008 -0600 msi: Fix handling of published installer properties. --- dlls/msi/action.c | 59 +++++++++++++++++++++++++++++++++++++-------- dlls/msi/tests/install.c | 55 ++++++++---------------------------------- 2 files changed, 59 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d52f48fed467885ede38a…

1 0

Andrew Talbot : msi: Assign to structs instead of using memcpy.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 6661f4343849c900f4a52c5f1f4805e084351362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6661f4343849c900f4a52c5f1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 6 22:33:47 2008 +0000 msi: Assign to structs instead of using memcpy. --- dlls/msi/suminfo.c | 8 ++++---- dlls/msi/table.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 5dd3297..d78e8ad 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -232,7 +232,7 @@ static void read_properties_from_data( PROPVARIANT *prop, LPBYTE data, DWORD sz else ptr = &property; - memcpy(&prop[ idofs[i].propid ], ptr, sizeof(PROPVARIANT)); + prop[ idofs[i].propid ] = *ptr; } } @@ -387,7 +387,7 @@ static UINT save_summary_info( const MSISUMMARYINFO * si, IStream *stm ) /* write the format header */ sz = sizeof format_hdr; - memcpy( &format_hdr.fmtid, &FMTID_SummaryInformation, sizeof (FMTID) ); + format_hdr.fmtid = FMTID_SummaryInformation; format_hdr.dwOffset = sizeof format_hdr + sizeof set_hdr; r = IStream_Write( stm, &format_hdr, sz, &count ); if( FAILED(r) || count != sz ) @@ -624,7 +624,7 @@ static UINT get_prop( MSIHANDLE handle, UINT uiProperty, UINT *puiDataType, break; case VT_FILETIME: if( pftValue ) - memcpy(pftValue, &prop->u.filetime, sizeof (FILETIME) ); + *pftValue = prop->u.filetime; break; case VT_EMPTY: break; @@ -745,7 +745,7 @@ static UINT set_prop( MSIHANDLE handle, UINT uiProperty, UINT uiDataType, prop->u.iVal = iValue; break; case VT_FILETIME: - memcpy( &prop->u.filetime, pftValue, sizeof prop->u.filetime ); + prop->u.filetime = *pftValue; break; case VT_LPSTR: if( str->unicode ) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 69108ef..a8f0f40 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -923,7 +923,7 @@ static UINT get_defaulttablecolumns( LPCWSTR name, MSICOLUMNINFO *colinfo, UINT { if (colinfo && (i < *sz) ) { - memcpy( &colinfo[i], &p[i], sizeof(MSICOLUMNINFO) ); + colinfo[i] = p[i]; colinfo[i].tablename = strdupW( p[i].tablename ); colinfo[i].colname = strdupW( p[i].colname ); }

1 0