January 2006 - Wine-Commits

Robert Shearman : ole: Fix WM_QUIT Handling in CoWaitForMultipleHandles.
by Alexandre Julliard Jan. 20, 2006

Jan. 20, 2006

Module: wine Branch: refs/heads/master Commit: 6e0029f83d8854cf303b9a44bdfc275900034c9a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e0029f83d8854cf303b9a4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jan 20 16:14:23 2006 +0100 ole: Fix WM_QUIT Handling in CoWaitForMultipleHandles. When a WM_QUIT message in encountered in CoWaitForMultipleHandles then it should repost the WM_QUIT message and then switch to waiting without checking messages. --- dlls/ole32/compobj.c | 59 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 80ecd11..ed0e4f9 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2658,9 +2658,8 @@ HRESULT WINAPI CoWaitForMultipleHandles( ULONG cHandles, const HANDLE* pHandles, LPDWORD lpdwindex) { HRESULT hr = S_OK; - DWORD wait_flags = (dwFlags & COWAIT_WAITALL) ? MWMO_WAITALL : 0 | - (dwFlags & COWAIT_ALERTABLE ) ? MWMO_ALERTABLE : 0; DWORD start_time = GetTickCount(); + BOOL message_loop = TRUE; TRACE("(0x%08lx, 0x%08lx, %ld, %p, %p)\n", dwFlags, dwTimeout, cHandles, pHandles, lpdwindex); @@ -2669,37 +2668,56 @@ HRESULT WINAPI CoWaitForMultipleHandles( { DWORD now = GetTickCount(); DWORD res; - + if ((dwTimeout != INFINITE) && (start_time + dwTimeout >= now)) { hr = RPC_S_CALLPENDING; break; } - TRACE("waiting for rpc completion or window message\n"); + if (message_loop) + { + DWORD wait_flags = (dwFlags & COWAIT_WAITALL) ? MWMO_WAITALL : 0 | + (dwFlags & COWAIT_ALERTABLE ) ? MWMO_ALERTABLE : 0; - res = MsgWaitForMultipleObjectsEx(cHandles, pHandles, - (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, - QS_ALLINPUT, wait_flags); + TRACE("waiting for rpc completion or window message\n"); - if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ - { - MSG msg; - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + res = MsgWaitForMultipleObjectsEx(cHandles, pHandles, + (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, + QS_ALLINPUT, wait_flags); + + if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { - /* FIXME: filter the messages here */ - TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); - TranslateMessage(&msg); - DispatchMessageW(&msg); - if (msg.message == WM_QUIT) + MSG msg; + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { - TRACE("resending WM_QUIT to outer message loop\n"); - PostQuitMessage(msg.wParam); - goto done; + /* FIXME: filter the messages here */ + TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); + TranslateMessage(&msg); + DispatchMessageW(&msg); + if (msg.message == WM_QUIT) + { + TRACE("resending WM_QUIT to outer message loop\n"); + PostQuitMessage(msg.wParam); + /* no longer need to process messages */ + message_loop = FALSE; + break; + } } + continue; } } - else if ((res >= WAIT_OBJECT_0) && (res < WAIT_OBJECT_0 + cHandles)) + else + { + TRACE("waiting for rpc completion\n"); + + res = WaitForMultipleObjectsEx(cHandles, pHandles, + (dwFlags & COWAIT_WAITALL) ? TRUE : FALSE, + (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, + (dwFlags & COWAIT_ALERTABLE) ? TRUE : FALSE); + } + + if ((res >= WAIT_OBJECT_0) && (res < WAIT_OBJECT_0 + cHandles)) { /* handle signaled, store index */ *lpdwindex = (res - WAIT_OBJECT_0); @@ -2717,7 +2735,6 @@ HRESULT WINAPI CoWaitForMultipleHandles( break; } } -done: TRACE("-- 0x%08lx\n", hr); return hr; }

1 0

H. Verbeet : wined3d: Fix a few TRACEs in pixelshader.c.
by Alexandre Julliard Jan. 20, 2006

Jan. 20, 2006

Module: wine Branch: refs/heads/master Commit: 12805f08aac1b619df3ac9668da8cd218775ce02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12805f08aac1b619df3ac96… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jan 20 16:13:57 2006 +0100 wined3d: Fix a few TRACEs in pixelshader.c. --- dlls/wined3d/pixelshader.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 21cc284..a202942 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -864,7 +864,7 @@ inline static void addline(unsigned int } *pgmLength += lineLen; - ++lineNum; + ++(*lineNum); TRACE("GL HW (%u, %u) : %s", *lineNum, *pgmLength, line); } @@ -1095,7 +1095,6 @@ inline static VOID IWineD3DPixelShaderIm #endif pInstr = pToken; curOpcode = pshader_program_get_opcode(*pToken, version); - TRACE("Found opcode %s %s\n", curOpcode->name,curOpcode->glname); ++pToken; if (NULL == curOpcode) { /* unknown current opcode ... (shouldn't be any!) */ @@ -1108,6 +1107,7 @@ inline static VOID IWineD3DPixelShaderIm FIXME("Token %s requires greater functionality than Fragment_Progarm_ARB supports\n", curOpcode->name); pToken += curOpcode->num_params; } else { + TRACE("Found opcode %s %s\n", curOpcode->name, curOpcode->glname); saturate = FALSE; /* Build opcode for GL vertex_program */ @@ -1399,7 +1399,7 @@ inline static VOID IWineD3DPixelShaderIm case D3DSPDM_D8: D8 = TRUE; break; #endif default: - TRACE("_unhandled_modifier(0x%08lx)", mask); + TRACE("_unhandled_modifier(0x%08lx)\n", mask); } } @@ -1491,9 +1491,14 @@ inline static VOID IWineD3DPixelShaderIm /* finally null terminate the pgmStr*/ pgmStr[pgmLength] = 0; if (GL_SUPPORT(ARB_VERTEX_PROGRAM)) { - TRACE("(%p) : Generated program %s\n", This, pgmStr); /* Create the hw shader */ + /* pgmStr sometimes gets too long for a normal TRACE */ + TRACE("Generated program:\n"); + if (TRACE_ON(d3d_shader)) { + fprintf(stderr, "%s\n", pgmStr); + } + /* TODO: change to resource.glObjectHandel or something like that */ GL_EXTCALL(glGenProgramsARB(1, &This->prgId));

1 0

H. Verbeet : wined3d: Return the correct pixelshader in
by Alexandre Julliard Jan. 20, 2006

Jan. 20, 2006

Module: wine Branch: refs/heads/master Commit: f5c2e85b4653a1245a06f808df3c699d8335c661 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5c2e85b4653a1245a06f80… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jan 20 16:13:12 2006 +0100 wined3d: Return the correct pixelshader in IWineD3DDeviceImpl_GetPixelShader. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b057a36..2ffeb1a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3967,7 +3967,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetPix return D3DERR_INVALIDCALL; } - *ppShader = This->updateStateBlock->pixelShader; + *ppShader = This->stateBlock->pixelShader; if (NULL != ppShader) { IWineD3DPixelShader_AddRef(*ppShader); }

1 0

H. Verbeet : wined3d: A shader isn't guaranteed to have a vertex declaration, so
by Alexandre Julliard Jan. 20, 2006

Jan. 20, 2006

Module: wine Branch: refs/heads/master Commit: 4bd8b60bd315a8c13cc8ba4c00f9d323ffed862c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4bd8b60bd315a8c13cc8ba4… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Jan 20 16:13:03 2006 +0100 wined3d: A shader isn't guaranteed to have a vertex declaration, so add a NULL check for that. --- dlls/wined3d/drawprim.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b856d55..eded7f9 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1777,6 +1777,7 @@ UINT numberOfvertices, UINT numberOfIndi if (useVertexShaderFunction) { int i; GLint errPos; + IWineD3DVertexDeclarationImpl *vertexDeclaration; FIXME("Using vertex shader\n"); @@ -1790,11 +1791,14 @@ UINT numberOfvertices, UINT numberOfIndi TRACE_(d3d_shader)("(%p) bound program %u and enabled vertex program ARB\n", This, ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->prgId); /* Vertex Shader 8 constants */ - if (((IWineD3DVertexDeclarationImpl *)((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->vertexDeclaration)->constants != NULL) { - float *constants = ((IWineD3DVertexDeclarationImpl *)((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->vertexDeclaration)->constants; - for (i = 0; i <= WINED3D_VSHADER_MAX_CONSTANTS; i++) { - TRACE_(d3d_shader)("Not Loading constants %u = %f %f %f %f\n", i, constants[i * 4], constants[i * 4 + 1], constants[i * 4 + 2], constants[i * 4 + 3]); - GL_EXTCALL(glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, i, &constants[i * 4])); + vertexDeclaration = (IWineD3DVertexDeclarationImpl *)((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->vertexDeclaration; + if (vertexDeclaration != NULL) { + float *constants = vertexDeclaration->constants; + if (constants != NULL) { + for (i = 0; i <= WINED3D_VSHADER_MAX_CONSTANTS; i++) { + TRACE_(d3d_shader)("Not Loading constants %u = %f %f %f %f\n", i, constants[i * 4], constants[i * 4 + 1], constants[i * 4 + 2], constants[i * 4 + 3]); + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, i, &constants[i * 4])); + } } }

1 0

Jacek Caban : shdocvw: Added GetWindow implementation.
by Alexandre Julliard Jan. 20, 2006

Jan. 20, 2006

Module: wine Branch: refs/heads/master Commit: 360a4aff2982a7d34595f25cd2f9f3f7a4caa4d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=360a4aff2982a7d34595f25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 20 16:12:36 2006 +0100 shdocvw: Added GetWindow implementation. --- dlls/shdocvw/oleobject.c | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 58eb6ef..656fe0d 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -459,22 +459,9 @@ static HRESULT WINAPI OleInPlaceObject_G { WebBrowser *This = INPLACEOBJ_THIS(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - -#if 0 - /* Create a fake window to fool MFC into believing that we actually - * have an implemented browser control. Avoids the assertion. - */ - HWND hwnd; - hwnd = CreateWindowA("BUTTON", "Web Control", - WS_HSCROLL | WS_VSCROLL | WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, 600, - 400, NULL, NULL, NULL, NULL); - - *phwnd = hwnd; - TRACE ("Returning hwnd = %d\n", hwnd); -#endif + TRACE("(%p)->(%p)\n", This, phwnd); + *phwnd = This->shell_embedding_hwnd; return S_OK; }

1 0

lostwages/ include/winehq.conf news/2006012001.xml
by WineHQ Jan. 20, 2006

Jan. 20, 2006

ChangeSet ID: 22410 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/01/20 12:24:19 Modified files: include : winehq.conf Added files: news : 2006012001.xml Log message: news about Wine 0.9.6 Patch: http://cvs.winehq.org/patch.py?id=22410 Old revision New revision Changes Path 1.29 1.30 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2006012001.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.29 lostwages/include/winehq.conf:1.30 --- lostwages/include/winehq.conf:1.29 20 Jan 2006 18:24:19 -0000 +++ lostwages/include/winehq.conf 20 Jan 2006 18:24:19 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.5 +snapshot_date: 0.9.6 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2006012001.xml diff -u -p /dev/null lostwages/news/2006012001.xml:1.1 --- /dev/null 20 Jan 2006 18:24:19 -0000 +++ lostwages/news/2006012001.xml 20 Jan 2006 18:24:19 -0000 @@ -0,0 +1,25 @@ +<news> + <date>January 20, 2006</date> + <title>Wine 0.9.6 Released</title> + <body> +<p> +Wine 0.9.6 is now available for download. +The following changes were noted in the announcement: +<ul> +<li> A bunch of OLE fixes and improvements.</li> +<li> DirectSound improvements, including full duplex support.</li> +<li> Fix for the Windows metafile vulnerability.</li> +<li> Many static control improvements.</li> +<li> Some fixes for copy protection support.</li> + +</ul></p> +<p> + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.6.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.110">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. +</p> + </body> +</news>

1 0

tools/. mozactivex.php
by Jeremy Newman Jan. 19, 2006

Jan. 19, 2006

1 0

Tag wine-0.9.6 : Alexandre Julliard : Release 0.9.6
by Alexandre Julliard Jan. 19, 2006

Jan. 19, 2006

Module: wine Branch: refs/tags/wine-0.9.6 Tag: 8f8f7ac8f4f7d80bd7a2bfb7d87d5aa5e8abbb2d URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=8f8f7ac8f4f7d80bd7a2bfb7d8… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 15:13:22 2006 +0100 Release 0.9.6

1 0

Alexandre Julliard : Release 0.9.6.
by Alexandre Julliard Jan. 19, 2006

Jan. 19, 2006

Module: wine Branch: refs/heads/master Commit: 13c7e9de05088f5897a6e8d3cabce1820e38334b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13c7e9de05088f5897a6e8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 15:13:21 2006 +0100 Release 0.9.6. --- ANNOUNCE | 13 - ChangeLog | 1572 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1590 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=13c7e9de05088f5897a…

1 0

Saulius Krasuckas : mscms: Check an appropriate registry key.
by Alexandre Julliard Jan. 19, 2006

Jan. 19, 2006

Module: wine Branch: refs/heads/master Commit: 2f7504e717f613c6a131857c1448c654c71afb98 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f7504e717f613c6a131857… Author: Saulius Krasuckas <saulius.krasuckas(a)gmail.com> Date: Thu Jan 19 12:44:02 2006 +0100 mscms: Check an appropriate registry key. --- dlls/mscms/tests/Makefile.in | 2 +- dlls/mscms/tests/profile.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/tests/Makefile.in b/dlls/mscms/tests/Makefile.in index 70a6695..db5e990 100644 --- a/dlls/mscms/tests/Makefile.in +++ b/dlls/mscms/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = mscms.dll -IMPORTS = kernel32 +IMPORTS = advapi32 kernel32 CTESTS = \ profile.c diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 39f90a7..5881891 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "winnls.h" #include "wingdi.h" #include "winuser.h" @@ -496,6 +497,59 @@ static void enum_registered_color_profil trace("\n"); } +static HKEY reg_open_mscms_key(void) +{ + char win9x[] = "SOFTWARE\\Microsoft\\Windows"; + char winNT[] = "SOFTWARE\\Microsoft\\Windows NT"; + char ICM[] = "CurrentVersion\\ICM\\RegisteredProfiles"; + HKEY win9x_key, winNT_key, ICM_key; + + RegOpenKeyExA( HKEY_LOCAL_MACHINE, win9x, 0, KEY_READ, &win9x_key ); + RegOpenKeyExA( HKEY_LOCAL_MACHINE, winNT, 0, KEY_READ, &winNT_key ); + + if (RegOpenKeyExA( winNT_key, ICM, 0, KEY_READ, &ICM_key )) + RegOpenKeyExA( win9x_key, ICM, 0, KEY_READ, &ICM_key ); + RegCloseKey( win9x_key ); + RegCloseKey( winNT_key ); + + if ( !ICM_key ) return NULL; + return ICM_key; +} + +static void check_registry(void) +{ + HKEY hkIcmKey; + LONG res; + DWORD i, dwValCount; + char szName[16383]; + char szData[MAX_PATH+1]; + DWORD dwNameLen, dwDataLen, dwType; + + hkIcmKey = reg_open_mscms_key(); + if (!hkIcmKey) + { + trace("Key 'HKLM\\SOFTWARE\\Microsoft\\Windows*\\CurrentVersion\\ICM\\RegisteredProfiles' not found\n" ); + return; + } + + res = RegQueryInfoKeyA(hkIcmKey, NULL, NULL, NULL, NULL, NULL, NULL, &dwValCount, NULL, NULL, NULL, NULL); + trace("Count of profile entries found directly in the registry: %ld\n", dwValCount); + if (dwValCount<1) return; + + for (i = 0; i<dwValCount; i++) + { + dwNameLen = sizeof(szName); + dwDataLen = sizeof(szData); + res = RegEnumValueA( hkIcmKey, i, szName, &dwNameLen, NULL, &dwType, (LPBYTE)szData, &dwDataLen ); + if (res != ERROR_SUCCESS) break; + ok( dwType == REG_SZ, "RegEnumValueA() returned unexpected value type (%ld)\n", dwType ); + if (dwType != REG_SZ) break; + trace(" found '%s' value containing '%s' (%d chars)\n", szName, szData, strlen(szData)); + } + + RegCloseKey( hkIcmKey ); +} + #define fail_GSCSPA(pMachName, dwProfID, pProfName, pdwSz, dwSz, GLE_OK) \ do { \ size = dwSz; \ @@ -1193,6 +1247,7 @@ START_TEST(profile) test_GetCountColorProfileElements(); enum_registered_color_profiles(); + check_registry(); test_GetStandardColorSpaceProfileA(); test_GetStandardColorSpaceProfileW();

1 0