March 2007 - Wine-Commits - list.winehq.org

James Hawkins : msi: Load the folder property if available and requested.
by Alexandre Julliard March 29, 2007

March 29, 2007

Module: wine Branch: master Commit: 8cedb218c314f444612fd3dea67a8834d2f596e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cedb218c314f444612fd3dea… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 29 02:38:57 2007 -0500 msi: Load the folder property if available and requested. --- dlls/msi/action.c | 18 ++++++++-------- dlls/msi/custom.c | 2 +- dlls/msi/files.c | 4 +- dlls/msi/format.c | 2 +- dlls/msi/helpers.c | 11 ++++++++- dlls/msi/install.c | 12 +++++----- dlls/msi/msipriv.h | 2 +- dlls/msi/tests/install.c | 52 +++++++++++++++++++++++++++++++++++++++++++++- 8 files changed, 80 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8cedb218c314f444612fd…

1 0

Jacek Caban : winnt.h: Added activation context structures declarations.
by Alexandre Julliard March 29, 2007

March 29, 2007

Module: wine Branch: master Commit: 06bd1bf8e1620da270a90e1c7640634397506704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06bd1bf8e1620da270a90e1c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 18:05:03 2007 +0200 winnt.h: Added activation context structures declarations. --- include/winnt.h | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b86e851..04f5cf6 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4798,6 +4798,86 @@ ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE); #define VER_AND 6 #define VER_OR 7 +typedef struct _ACTIVATION_CONTEXT_DETAILED_INFORMATION { + DWORD dwFlags; + DWORD ulFormatVersion; + DWORD ulAssemblyCount; + DWORD ulRootManifestPathType; + DWORD ulRootManifestPathChars; + DWORD ulRootConfigurationPathType; + DWORD ulRootConfigurationPathChars; + DWORD ulAppDirPathType; + DWORD ulAppDirPathChars; + PCWSTR lpRootManifestPath; + PCWSTR lpRootConfigurationPath; + PCWSTR lpAppDirPath; +} ACTIVATION_CONTEXT_DETAILED_INFORMATION, *PACTIVATION_CONTEXT_DETAILED_INFORMATION; + +typedef struct _ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION { + DWORD ulFlags; + DWORD ulEncodedAssemblyIdentityLength; + DWORD ulManifestPathType; + DWORD ulManifestPathLength; + LARGE_INTEGER liManifestLastWriteTime; + DWORD ulPolicyPathType; + DWORD ulPolicyPathLength; + LARGE_INTEGER liPolicyLastWriteTime; + DWORD ulMetadataSatelliteRosterIndex; + DWORD ulManifestVersionMajor; + DWORD ulManifestVersionMinor; + DWORD ulPolicyVersionMajor; + DWORD ulPolicyVersionMinor; + DWORD ulAssemblyDirectoryNameLength; + PCWSTR lpAssemblyEncodedAssemblyIdentity; + PCWSTR lpAssemblyManifestPath; + PCWSTR lpAssemblyPolicyPath; + PCWSTR lpAssemblyDirectoryName; + DWORD ulFileCount; +} ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION, *PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION; + +typedef struct _ACTIVATION_CONTEXT_QUERY_INDEX { + DWORD ulAssemblyIndex; + DWORD ulFileIndexInAssembly; +} ACTIVATION_CONTEXT_QUERY_INDEX, *PACTIVATION_CONTEXT_QUERY_INDEX; + +typedef const struct _ACTIVATION_CONTEXT_QUERY_INDEX *PCACTIVATION_CONTEXT_QUERY_INDEX; + +typedef struct _ASSEMBLY_FILE_DETAILED_INFORMATION { + DWORD ulFlags; + DWORD ulFilenameLength; + DWORD ulPathLength; + PCWSTR lpFileName; + PCWSTR lpFilePath; +} ASSEMBLY_FILE_DETAILED_INFORMATION, *PASSEMBLY_FILE_DETAILED_INFORMATION; + +typedef const ASSEMBLY_FILE_DETAILED_INFORMATION *PCASSEMBLY_FILE_DETAILED_INFORMATION; + +typedef enum _ACTIVATION_CONTEXT_INFO_CLASS { + ActivationContextBasicInformation = 1, + ActivationContextDetailedInformation = 2, + AssemblyDetailedInformationInActivationContext = 3, + FileInformationInAssemblyOfAssemblyInActivationContext = 4, + MaxActivationContextInfoClass, + + AssemblyDetailedInformationInActivationContxt = 3, + FileInformationInAssemblyOfAssemblyInActivationContxt = 4 +} ACTIVATION_CONTEXT_INFO_CLASS; + +#define ACTIVATION_CONTEXT_PATH_TYPE_NONE 1 +#define ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE 2 +#define ACTIVATION_CONTEXT_PATH_TYPE_URL 3 +#define ACTIVATION_CONTEXT_PATH_TYPE_ASSEMBLYREF 4 + +#define ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION 1 +#define ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION 2 +#define ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION 3 +#define ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION 4 +#define ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION 5 +#define ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION 6 +#define ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION 7 +#define ACTIVATION_CONTEXT_SECTION_GLOBAL_OBJECT_RENAME_TABLE 8 +#define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 + #ifdef __cplusplus } #endif

1 0

Andrew Riedi : dsound: Change a couple DPRINTF's to TRACE's
by Alexandre Julliard March 29, 2007

March 29, 2007

Module: wine Branch: master Commit: 447d5c219b7fa4ccad01f93e247fc8eed7d0c13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=447d5c219b7fa4ccad01f93e2… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Wed Mar 28 08:30:16 2007 -0700 dsound: Change a couple DPRINTF's to TRACE's --- dlls/dsound/dsound.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 33df102..b10a8d3 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -146,7 +146,7 @@ static void _dump_DSCAPS(DWORD xmask) { for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if ((flags[i].mask & xmask) == flags[i].mask) - DPRINTF("%s ",flags[i].name); + TRACE("%s ",flags[i].name); } static void _dump_DSBCAPS(DWORD xmask) { @@ -174,7 +174,7 @@ static void _dump_DSBCAPS(DWORD xmask) { for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) if ((flags[i].mask & xmask) == flags[i].mask) - DPRINTF("%s ",flags[i].name); + TRACE("%s ",flags[i].name); } /*******************************************************************************

1 0

Jacek Caban : mshtml: Added DIID_DispHTMLDocument to QueryInterface.
by Alexandre Julliard March 29, 2007

March 29, 2007

Module: wine Branch: master Commit: 0b94f19cb93dd2728b81a055f4a168edd96eaf9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b94f19cb93dd2728b81a055f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 17:54:03 2007 +0200 mshtml: Added DIID_DispHTMLDocument to QueryInterface. --- dlls/mshtml/htmldoc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 65c1996..a009cc8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -113,6 +113,9 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID }else if(IsEqualGUID(&IID_IPersistStreamInit, riid)) { TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppvObject); *ppvObject = PERSTRINIT(This); + }else if(IsEqualGUID(&DIID_DispHTMLDocument, riid)) { + TRACE("(%p)->(DIID_DispHTMLDocument %p)\n", This, ppvObject); + *ppvObject = HTMLDOC(This); }else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppvObject); return E_NOINTERFACE;

1 0

Jacek Caban : mshtml: Added DispHTMLDocument dispinterface declaration.
by Alexandre Julliard March 29, 2007

March 29, 2007

Module: wine Branch: master Commit: 394c3f9adbc9952e1deb3932cab36cc1e0f63f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=394c3f9adbc9952e1deb3932c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 17:51:40 2007 +0200 mshtml: Added DispHTMLDocument dispinterface declaration. --- include/mshtmdid.h | 3 + include/mshtml.idl | 669 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 670 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=394c3f9adbc9952e1deb3…

1 0

Huw Davies : winex11.drv: Rename a local variable to avoid confusion with a global.
by Alexandre Julliard March 29, 2007

March 29, 2007

Module: wine Branch: master Commit: 232c16fadb0962353ab8eb4d80abf30416d4dc91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232c16fadb0962353ab8eb4d8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 29 11:55:59 2007 +0100 winex11.drv: Rename a local variable to avoid confusion with a global. --- dlls/winex11.drv/xrender.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 66b3dd4..b7b1e74 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1076,7 +1076,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag int textPixel, backgroundPixel; HRGN saved_region = 0; BOOL disable_antialias = FALSE; - AA_Type antialias = AA_None; + AA_Type aa_type = AA_None; DIBSECTION bmp; unsigned int idx; double cosEsc, sinEsc; @@ -1244,18 +1244,18 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag EnterCriticalSection(&xrender_cs); entry = glyphsetCache + physDev->xrender->cache_index; if( disable_antialias == FALSE ) - antialias = entry->aa_default; - formatEntry = entry->format[antialias]; + aa_type = entry->aa_default; + formatEntry = entry->format[aa_type]; for(idx = 0; idx < count; idx++) { if( !formatEntry ) { - UploadGlyph(physDev, wstr[idx], antialias); + UploadGlyph(physDev, wstr[idx], aa_type); /* re-evaluate antialias since aa_default may have changed */ if( disable_antialias == FALSE ) - antialias = entry->aa_default; - formatEntry = entry->format[antialias]; + aa_type = entry->aa_default; + formatEntry = entry->format[aa_type]; } else if( wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) { - UploadGlyph(physDev, wstr[idx], antialias); + UploadGlyph(physDev, wstr[idx], aa_type); } } if (!formatEntry) @@ -1299,7 +1299,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag wine_tsx11_lock(); XSetForeground( gdi_display, physDev->gc, textPixel ); - if(antialias == AA_None) { + if(aa_type == AA_None) { for(idx = 0; idx < count; idx++) { SharpGlyphMono(physDev, physDev->dc_rect.left + x + xoff, physDev->dc_rect.top + y + yoff,

1 0

Stefan Dösinger : ddraw: When changing the back buffers also update the render target.
by Alexandre Julliard March 29, 2007

March 29, 2007

Module: wine Branch: master Commit: 1d4a4b75bc5e0747c87fe0e84feacdc3a533af5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4a4b75bc5e0747c87fe0e84… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 27 17:41:25 2007 +0200 ddraw: When changing the back buffers also update the render target. --- dlls/ddraw/device.c | 5 +++++ dlls/ddraw/direct3d.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 231e2cd..2e26056 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -308,6 +308,11 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) /* Restore the render targets */ if(This->OffScreenTarget) { + /* Set the device up to render to the front buffer since the back buffer will + * vanish soon. + */ + IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0, + This->ddraw->d3d_target->WineD3DSurface); /* This->target is the offscreen target. * This->ddraw->d3d_target is the target used by DDraw */ diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index b716a60..3047f1d 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -855,6 +855,10 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, if(hr != D3D_OK) ERR("(%p) Error %08x setting the front and back buffer\n", This, hr); + /* Render to the back buffer */ + IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0, + target->WineD3DSurface); + object->OffScreenTarget = TRUE; } else

1 0

Dmitry Timoshkov : shlwapi: Match shlwapi wrappers to MSDN descriptions.
by Alexandre Julliard March 29, 2007

March 29, 2007

Module: wine Branch: master Commit: 03e9e5b60d29f911dff9f3a659e6961a81c80b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e9e5b60d29f911dff9f3a65… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Mar 28 20:13:54 2007 +0900 shlwapi: Match shlwapi wrappers to MSDN descriptions. --- dlls/shlwapi/Makefile.in | 4 +- dlls/shlwapi/ordinal.c | 341 ++++++------------------------------------ dlls/shlwapi/path.c | 2 +- dlls/shlwapi/shlwapi.spec | 10 +- dlls/shlwapi/shlwapi_main.c | 20 +--- dlls/shlwapi/string.c | 20 +-- dlls/shlwapi/thread.c | 23 +--- 7 files changed, 65 insertions(+), 355 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03e9e5b60d29f911dff9f…

1 0

Aric Stewart : imm32: Change the default IME window to better reflect applications request.
by Alexandre Julliard March 29, 2007

March 29, 2007

Module: wine Branch: master Commit: 735891354578abc075f7fe7bc9a7790da7dc1553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735891354578abc075f7fe7bc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 26 14:51:40 2007 -0500 imm32: Change the default IME window to better reflect applications request. First part of this change was proposed by Byeong-Sik Jeon. Additionally respect parameters give to us by ImmSetCompositionWindow for placement of the composition window. --- dlls/imm32/imm.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 02a362e..0aa28f0 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -763,8 +763,8 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) static const WCHAR the_name[] = {'I','M','E','\0'}; IMM_Register(); - hwndDefault = CreateWindowExW( WS_EX_CLIENTEDGE, WC_IMECLASSNAME, - the_name, WS_POPUPWINDOW|WS_CAPTION, 0, 0, 120, 55, 0, 0, + hwndDefault = CreateWindowExW( WS_EX_TOOLWINDOW, WC_IMECLASSNAME, + the_name, WS_POPUP, 0, 0, 1, 1, 0, 0, hImeInst, 0); TRACE("Default created (%p)\n",hwndDefault); @@ -1556,6 +1556,7 @@ static void PaintDefaultIMEWnd(HWND hwnd) RECT rect; HDC hdc = BeginPaint(hwnd,&ps); GetClientRect(hwnd,&rect); + FillRect(hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); if (root_context->dwCompStringLength && root_context->CompositionString) { @@ -1566,8 +1567,6 @@ static void PaintDefaultIMEWnd(HWND hwnd) if (root_context->textfont) oldfont = SelectObject(hdc,root_context->textfont); - TextOutW(hdc, 0,0,(LPWSTR)root_context->CompositionString, - root_context->dwCompStringLength / sizeof(WCHAR)); GetTextExtentPoint32W(hdc, (LPWSTR)root_context->CompositionString, root_context->dwCompStringLength / sizeof(WCHAR), @@ -1575,12 +1574,44 @@ static void PaintDefaultIMEWnd(HWND hwnd) pt.x = size.cx; pt.y = size.cy; LPtoDP(hdc,&pt,1); - rect.left = pt.x; + + if (root_context->CompForm.dwStyle == CFS_POINT || + root_context->CompForm.dwStyle == CFS_FORCE_POSITION) + { + POINT cpt = root_context->CompForm.ptCurrentPos; + ClientToScreen(root_context->hwnd,&cpt); + rect.left = cpt.x; + rect.top = cpt.y; + rect.right = rect.left + pt.x + 20; + rect.bottom = rect.top + pt.y + 20; + } + else if (root_context->CompForm.dwStyle == CFS_RECT) + { + POINT cpt; + cpt.x = root_context->CompForm.rcArea.left; + cpt.y = root_context->CompForm.rcArea.top; + ClientToScreen(root_context->hwnd,&cpt); + rect.left = cpt.x; + rect.top = cpt.y; + cpt.x = root_context->CompForm.rcArea.right; + cpt.y = root_context->CompForm.rcArea.bottom; + ClientToScreen(root_context->hwnd,&cpt); + rect.right = cpt.x; + rect.bottom = cpt.y; + } + else + { + rect.right = rect.left + pt.x + 20; + rect.bottom = rect.top + pt.y + 20; + } + MoveWindow(hwnd, rect.left, rect.top, rect.right - rect.left , + rect.bottom - rect.top, FALSE); + TextOutW(hdc, 10,10,(LPWSTR)root_context->CompositionString, + root_context->dwCompStringLength / sizeof(WCHAR)); if (oldfont) SelectObject(hdc,oldfont); } - FillRect(hdc,&rect, (HBRUSH) (COLOR_WINDOW+1)); EndPaint(hwnd,&ps); }

1 0

James Hawkins : setupapi: SetLastError to ERROR_SUCCESS on success.
by Alexandre Julliard March 28, 2007

March 28, 2007

Module: wine Branch: master Commit: 405b96e979dcb751988e061cd1f78319232d3d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=405b96e979dcb751988e061cd… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 28 01:57:33 2007 -0500 setupapi: SetLastError to ERROR_SUCCESS on success. --- dlls/setupapi/misc.c | 2 ++ dlls/setupapi/tests/misc.c | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 4c7786f..04941a5 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -921,6 +921,7 @@ done: MyFree( destW ); HeapFree( GetProcessHeap(), 0, sourceW ); HeapFree( GetProcessHeap(), 0, locationW ); + if (ret) SetLastError(ERROR_SUCCESS); return ret; } @@ -980,6 +981,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, if (component) *component = p + 1; if (required_size) *required_size = size; + if (ret) SetLastError(ERROR_SUCCESS); return ret; } diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index d566816..2efaa64 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -243,11 +243,8 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = SetupCopyOEMInf(path, NULL, SPOST_NONE, SP_COPY_DELETESOURCE, NULL, 0, NULL, NULL); ok(res == TRUE, "Expected TRUE, got %d\n", res); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(!file_exists(path), "Expected source inf to not exist\n"); - todo_wine - { - ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - } } START_TEST(misc)

1 0