October 2011 - Wine-commits

Francois Gouget : winefile: Fix a string resource so its format placeholders can be reordered.
by Alexandre Julliard 20 Oct '11

20 Oct '11

1 0

Francois Gouget : wineconsole: Fix a string resource so its format placeholders can be reordered.
by Alexandre Julliard 20 Oct '11

20 Oct '11

1 0

Alexandre Julliard : wineps: Chain to the next driver when not using a device font.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: c66b6112058ca6042b0459cb061d82ef8f6098bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66b6112058ca6042b0459cb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 18 21:58:25 2011 +0200 wineps: Chain to the next driver when not using a device font. --- dlls/wineps.drv/builtin.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index c74f1a6..16c67f8 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -264,7 +264,11 @@ BOOL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - assert(physDev->font.fontloc == Builtin); + if (physDev->font.fontloc == Download) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextMetrics ); + return dev->funcs->pGetTextMetrics( dev, metrics ); + } memcpy(metrics, &(physDev->font.fontinfo.Builtin.tm), sizeof(physDev->font.fontinfo.Builtin.tm)); @@ -322,7 +326,11 @@ BOOL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, float width = 0.0; float scale; - assert(physDev->font.fontloc == Builtin); + if (physDev->font.fontloc == Download) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPoint ); + return dev->funcs->pGetTextExtentExPoint( dev, str, count, maxExt, lpnFit, alpDx, size ); + } TRACE("%s %i\n", debugstr_wn(str, count), count); @@ -357,7 +365,11 @@ BOOL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); UINT i; - assert(physDev->font.fontloc == Builtin); + if (physDev->font.fontloc == Download) + { + dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); + return dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buffer ); + } TRACE("U+%.4X U+%.4X\n", firstChar, lastChar);

1 0

Alexandre Julliard : gdi32: Implement GetTextExtentExPointW as a standard driver entry point.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 6ad9eb805c558896f866ca8177503b4a461abe66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad9eb805c558896f866ca817… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 18 22:00:16 2011 +0200 gdi32: Implement GetTextExtentExPointW as a standard driver entry point. --- dlls/gdi32/font.c | 11 +++-------- dlls/gdi32/freetype.c | 30 ++++++++++++++---------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ea11fcd..72d9f83 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1116,6 +1116,7 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, DC *dc; BOOL ret = FALSE; TEXTMETRICW tm; + PHYSDEV dev; TRACE("(%p, %s, %d)\n",hdc,debugstr_wn(str,count),maxExt); @@ -1141,14 +1142,8 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, else dxs = alpDx; - if (dc->gdiFont) - ret = WineEngGetTextExtentExPoint(dc->gdiFont, str, count, - 0, NULL, dxs, size); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); - ret = physdev->funcs->pGetTextExtentExPoint(physdev, str, count, 0, NULL, dxs, size); - } + dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); + ret = dev->funcs->pGetTextExtentExPoint(dev, str, count, 0, NULL, dxs, size); /* Perform device size to world size transformations. */ if (ret) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ae1de99..af4da1e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6445,11 +6445,10 @@ BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD } /************************************************************* - * WineEngGetTextExtentExPoint - * + * freetype_GetTextExtentExPoint */ -BOOL WineEngGetTextExtentExPoint(GdiFont *font, LPCWSTR wstr, INT count, - INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size) +static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, + INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; INT idx; @@ -6458,19 +6457,25 @@ BOOL WineEngGetTextExtentExPoint(GdiFont *font, LPCWSTR wstr, INT count, TEXTMETRICW tm; FT_UInt glyph_index; GdiFont *linked_font; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPoint ); + return dev->funcs->pGetTextExtentExPoint( dev, wstr, count, max_ext, pnfit, dxs, size ); + } - TRACE("%p, %s, %d, %d, %p\n", font, debugstr_wn(wstr, count), count, - max_ext, size); + TRACE("%p, %s, %d, %d, %p\n", physdev->font, debugstr_wn(wstr, count), count, max_ext, size); GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); size->cx = 0; - WineEngGetTextMetrics(font, &tm); + WineEngGetTextMetrics( physdev->font, &tm ); size->cy = tm.tmHeight; for(idx = 0; idx < count; idx++) { - get_glyph_index_linked(font, wstr[idx], &linked_font, &glyph_index); + get_glyph_index_linked( physdev->font, wstr[idx], &linked_font, &glyph_index ); WineEngGetGlyphOutline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); size->cx += FONT_GM(linked_font,glyph_index)->adv; @@ -7080,7 +7085,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetPixel */ NULL, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ - NULL, /* pGetTextExtentExPoint */ + freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ NULL, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ @@ -7228,13 +7233,6 @@ BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD return FALSE; } -BOOL WineEngGetTextExtentExPoint(GdiFont *font, LPCWSTR wstr, INT count, - INT max_ext, LPINT nfit, LPINT dx, LPSIZE size) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, INT max_ext, LPINT nfit, LPINT dx, LPSIZE size) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f59379b..47b2968 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -311,7 +311,6 @@ extern DWORD WineEngGetKerningPairs(GdiFont*, DWORD, KERNINGPAIR *) DECLSPEC_HID extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; extern UINT WineEngGetOutlineTextMetrics(GdiFont*, UINT, LPOUTLINETEXTMETRICW) DECLSPEC_HIDDEN; extern UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) DECLSPEC_HIDDEN; -extern BOOL WineEngGetTextExtentExPoint(GdiFont*, LPCWSTR, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern BOOL WineEngGetTextExtentExPointI(GdiFont*, const WORD *, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngGetTextMetrics(GdiFont*, LPTEXTMETRICW) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetCharWidthW as a standard driver entry point.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 5c1c7a65765d08ab0016722a21157a666e2260d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1c7a65765d08ab0016722a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 13:38:10 2011 +0200 gdi32: Implement GetCharWidthW as a standard driver entry point. --- dlls/gdi32/font.c | 12 ++++-------- dlls/gdi32/freetype.c | 26 ++++++++++++-------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 72d9f83..d08ba4b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1612,23 +1612,19 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, { UINT i; BOOL ret; + PHYSDEV dev; DC * dc = get_dc_ptr( hdc ); + if (!dc) return FALSE; - if (dc->gdiFont) - ret = WineEngGetCharWidth( dc->gdiFont, firstChar, lastChar, buffer ); - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - ret = physdev->funcs->pGetCharWidth( physdev, firstChar, lastChar, buffer); - } + dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); + ret = dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buffer ); if (ret) { /* convert device units to logical */ for( i = firstChar; i <= lastChar; i++, buffer++ ) *buffer = INTERNAL_XDSTOWS(dc, *buffer); - ret = TRUE; } release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index af4da1e..3f16a6f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6309,24 +6309,29 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, } /************************************************************* - * WineEngGetCharWidth - * + * freetype_GetCharWidth */ -BOOL WineEngGetCharWidth(GdiFont *font, UINT firstChar, UINT lastChar, - LPINT buffer) +static BOOL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer ) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; FT_UInt glyph_index; GdiFont *linked_font; + struct freetype_physdev *physdev = get_freetype_dev( dev ); - TRACE("%p, %d, %d, %p\n", font, firstChar, lastChar, buffer); + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); + return dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buffer ); + } + + TRACE("%p, %d, %d, %p\n", physdev->font, firstChar, lastChar, buffer); GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); for(c = firstChar; c <= lastChar; c++) { - get_glyph_index_linked(font, c, &linked_font, &glyph_index); + get_glyph_index_linked(physdev->font, c, &linked_font, &glyph_index); WineEngGetGlyphOutline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); buffer[c - firstChar] = FONT_GM(linked_font,glyph_index)->adv; @@ -7076,7 +7081,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pFlattenPath */ NULL, /* pFrameRgn */ NULL, /* pGdiComment */ - NULL, /* pGetCharWidth */ + freetype_GetCharWidth, /* pGetCharWidth */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetICMProfile */ @@ -7206,13 +7211,6 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, return 0; } -BOOL WineEngGetCharWidth(GdiFont *font, UINT firstChar, UINT lastChar, - LPINT buffer) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, LPABC buffer) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 47b2968..ad7b049 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -299,7 +299,6 @@ extern BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT firstChar, UINT lastChar, LPABCFLOAT buffer) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, LPABC buffer) DECLSPEC_HIDDEN; -extern BOOL WineEngGetCharWidth(GdiFont*, UINT, UINT, LPINT) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontUnicodeRanges(GdiFont *, LPGLYPHSET) DECLSPEC_HIDDEN; extern DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count,

1 0

Alexandre Julliard : xcopy: Fix varargs handling for 64-bit.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 6b59b05244534608a8ab71ef943f84d4568206e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b59b05244534608a8ab71ef9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 14:31:29 2011 +0200 xcopy: Fix varargs handling for 64-bit. --- programs/xcopy/xcopy.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index cfe58f3..f1c011f 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -93,7 +93,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -static int XCOPY_wprintf(const WCHAR *format, ...) { +static int __cdecl XCOPY_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL; @@ -101,7 +101,7 @@ static int XCOPY_wprintf(const WCHAR *format, ...) { static BOOL traceOutput = FALSE; #define MAX_WRITECONSOLE_SIZE 65535 - va_list parms; + __ms_va_list parms; DWORD nOut; int len; DWORD res = 0; @@ -119,11 +119,11 @@ static int XCOPY_wprintf(const WCHAR *format, ...) { return 0; } - va_start(parms, format); + __ms_va_start(parms, format); SetLastError(NO_ERROR); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, format, 0, 0, output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); - va_end(parms); + __ms_va_end(parms); if (len == 0 && GetLastError() != NO_ERROR) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0;

1 0

Vitaliy Margolen : dinput: Add some logging to base class.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 271c6a6c5f1a190ca8ea4b055bb4706e965e8b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271c6a6c5f1a190ca8ea4b055… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Oct 20 07:42:44 2011 -0600 dinput: Add some logging to base class. --- dlls/dinput/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index b088eff..b72b0d5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -783,6 +783,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; + TRACE("(%p)\n", This); + if (!This->data_format.user_df) return DIERR_INVALIDPARAM; if (This->dwCoopLevel & DISCL_FOREGROUND && This->win != GetForegroundWindow()) return DIERR_OTHERAPPHASPRIO; @@ -813,6 +815,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; + TRACE("(%p)\n", This); + EnterCriticalSection(&This->crit); res = !This->acquired ? DI_NOEFFECT : DI_OK; This->acquired = 0; @@ -930,9 +934,10 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(LPDIRECTINPUTDEVICE ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - ULONG ref; + ULONG ref = InterlockedDecrement(&(This->ref)); + + TRACE("(%p) releasing from %d\n", This, ref + 1); - ref = InterlockedDecrement(&(This->ref)); if (ref) return ref; IDirectInputDevice_Unacquire(iface);

1 0

Michael Mc Donnell : shell32: Set pointer to NULL after free to avoid double free.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 26f3c14d6b95e42b47b2e153be3b6a26d64b87ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f3c14d6b95e42b47b2e153b… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Oct 19 15:11:32 2011 -0400 shell32: Set pointer to NULL after free to avoid double free. --- dlls/shell32/shfldr_unixfs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 9649df8..606fa84 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -2440,6 +2440,7 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Next(IEnumIDList* iface, !UNIXFS_is_pidl_of_type(rgelt[i], This->m_fFilter)) { SHFree(rgelt[i]); + rgelt[i] = NULL; continue; } memset(((PBYTE)rgelt[i])+rgelt[i]->mkid.cb, 0, sizeof(USHORT));

1 0

Jacek Caban : ieframe: ieframe variant of IEWinMain is Unicode.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 2c47b66b715e36dfc0ea4676b39fb803f3b15cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c47b66b715e36dfc0ea4676b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 20 16:46:59 2011 +0200 ieframe: ieframe variant of IEWinMain is Unicode. --- dlls/ieframe/iexplore.c | 23 ++++++++++++----------- dlls/shdocvw/shdocvw_main.c | 15 +++++++++++++-- programs/iexplore/Makefile.in | 2 +- programs/iexplore/main.c | 10 ++++++---- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index d5fd56c..8dd6287 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -826,7 +826,7 @@ void released_obj(void) PostQuitMessage(0); } -static BOOL create_ie_window(LPCSTR cmdline) +static BOOL create_ie_window(const WCHAR *cmdline) { InternetExplorer *ie; HRESULT hres; @@ -842,25 +842,24 @@ static BOOL create_ie_window(LPCSTR cmdline) IWebBrowser2_GoHome(&ie->IWebBrowser2_iface); }else { VARIANT var_url; - DWORD len; int cmdlen; + static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e'}; + while(*cmdline == ' ' || *cmdline == '\t') cmdline++; - cmdlen = lstrlenA(cmdline); + cmdlen = strlenW(cmdline); if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { cmdline++; cmdlen -= 2; } - if(cmdlen == 7 && !memcmp(cmdline, "-nohome", 7)) { + if(cmdlen == sizeof(nohomeW)/sizeof(*nohomeW) && !memcmp(cmdline, nohomeW, sizeof(nohomeW))) { ie->nohome = TRUE; }else { V_VT(&var_url) = VT_BSTR; - len = MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, NULL, 0); - V_BSTR(&var_url) = SysAllocStringLen(NULL, len); - MultiByteToWideChar(CP_ACP, 0, cmdline, cmdlen, V_BSTR(&var_url), len); + V_BSTR(&var_url) = SysAllocStringLen(cmdline, cmdlen); /* navigate to the first page */ IWebBrowser2_Navigate2(&ie->IWebBrowser2_iface, &var_url, NULL, NULL, NULL, NULL); @@ -1020,12 +1019,14 @@ static void release_dde(void) * * Only returns on error. */ -DWORD WINAPI IEWinMain(const char *szCommandLine, int nShowWindow) +DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) { MSG msg; HRESULT hres; - TRACE("%s %d\n", debugstr_a(szCommandLine), nShowWindow); + static const WCHAR embeddingW[] = {'-','e','m','b','e','d','d','i','n','g',0}; + + TRACE("%s %d\n", debugstr_w(cmdline), nShowWindow); CoInitialize(NULL); @@ -1037,8 +1038,8 @@ DWORD WINAPI IEWinMain(const char *szCommandLine, int nShowWindow) init_dde(); - if(strcasecmp(szCommandLine, "-embedding")) { - if(!create_ie_window(szCommandLine)) { + if(strcmpiW(cmdline, embeddingW)) { + if(!create_ie_window(cmdline)) { CoUninitialize(); ExitProcess(1); } diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 88fe5ed..db9034c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -117,7 +117,9 @@ HRESULT WINAPI DllUnregisterServer(void) */ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) { - DWORD (WINAPI *pIEWinMain)(LPSTR,int); + DWORD (WINAPI *pIEWinMain)(const WCHAR*,int); + WCHAR *cmdline; + DWORD ret, len; TRACE("%s %d\n", debugstr_a(szCommandLine), nShowWindow); @@ -125,7 +127,16 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) if(!pIEWinMain) ExitProcess(1); - return pIEWinMain(szCommandLine, nShowWindow); + len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0); + cmdline = heap_alloc(len*sizeof(WCHAR)); + if(!cmdline) + ExitProcess(1); + MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, cmdline, len); + + ret = pIEWinMain(cmdline, nShowWindow); + + heap_free(cmdline); + return ret; } /************************************************************************* diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 9bdd85d..aa5ccbe 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = iexplore.exe -APPMODE = -mwindows +APPMODE = -mwindows -municode IMPORTS = ieframe DELAYIMPORTS = advpack version diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index 6065ba9..23a738f 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -25,7 +25,7 @@ #include "wine/unicode.h" #include "wine/debug.h" -extern DWORD WINAPI IEWinMain(LPSTR, int); +extern DWORD WINAPI IEWinMain(const WCHAR*, int); static BOOL check_native_ie(void) { @@ -68,13 +68,15 @@ static DWORD register_iexplore(BOOL doregister) return FAILED(hres); } -int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int show) { + static const WCHAR regserverW[] = {'r','e','g','s','e','r','v','e','r',0}; + static const WCHAR unregserverW[] = {'u','n','r','e','g','s','e','r','v','e','r',0}; if(*cmdline == '-' || *cmdline == '/') { - if(!strcasecmp(cmdline+1, "regserver")) + if(!strcmpiW(cmdline+1, regserverW)) return register_iexplore(TRUE); - if(!strcasecmp(cmdline+1, "unregserver")) + if(!strcmpiW(cmdline+1, unregserverW)) return register_iexplore(FALSE); }

1 0

Bernhard Loos : msi: Reorder tables to optimize condition evaluation.
by Alexandre Julliard 20 Oct '11

20 Oct '11

Module: wine Branch: master Commit: 4383aafadd296b11aecb7f53bee4c90041c3e00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4383aafadd296b11aecb7f53b… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Thu Oct 20 14:21:48 2011 +0200 msi: Reorder tables to optimize condition evaluation. --- dlls/msi/where.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 95 insertions(+), 8 deletions(-) diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 8272301..b7d1db8 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -599,14 +599,15 @@ static UINT WHERE_evaluate( MSIWHEREVIEW *wv, const UINT rows[], return ERROR_SUCCESS; } -static UINT check_condition( MSIWHEREVIEW *wv, MSIRECORD *record, JOINTABLE *table, +static UINT check_condition( MSIWHEREVIEW *wv, MSIRECORD *record, JOINTABLE **tables, UINT table_rows[] ) { UINT r = ERROR_FUNCTION_FAILED; INT val; - for (table_rows[table->table_index] = 0; table_rows[table->table_index] < table->row_count; - table_rows[table->table_index]++) + for (table_rows[(*tables)->table_index] = 0; + table_rows[(*tables)->table_index] < (*tables)->row_count; + table_rows[(*tables)->table_index]++) { val = 0; wv->rec_index = 0; @@ -615,9 +616,9 @@ static UINT check_condition( MSIWHEREVIEW *wv, MSIRECORD *record, JOINTABLE *tab break; if (val) { - if (table->next) + if (*(tables + 1)) { - r = check_condition(wv, record, table->next, table_rows); + r = check_condition(wv, record, tables + 1, table_rows); if (r != ERROR_SUCCESS) break; } @@ -629,7 +630,7 @@ static UINT check_condition( MSIWHEREVIEW *wv, MSIRECORD *record, JOINTABLE *tab } } } - table_rows[table->table_index] = INVALID_ROW_INDEX; + table_rows[(*tables)->table_index] = INVALID_ROW_INDEX; return r; } @@ -680,13 +681,96 @@ static int compare_entry( const void *left, const void *right ) return 0; } +static void add_to_array( JOINTABLE **array, JOINTABLE *elem ) +{ + while (*array && *array != elem) + array++; + if (!*array) + *array = elem; +} + +static BOOL in_array( JOINTABLE **array, JOINTABLE *elem ) +{ + while (*array && *array != elem) + array++; + return *array != NULL; +} + +#define CONST_EXPR 1 /* comparison to a constant value */ +#define JOIN_TO_CONST_EXPR 0x10000 /* comparison to a table involved with + a CONST_EXPR comaprison */ + +static UINT reorder_check( const struct expr *expr, JOINTABLE **ordered_tables, + BOOL process_joins, JOINTABLE **lastused ) +{ + UINT res = 0; + + switch (expr->type) + { + case EXPR_WILDCARD: + case EXPR_SVAL: + case EXPR_UVAL: + return 0; + case EXPR_COL_NUMBER: + case EXPR_COL_NUMBER32: + case EXPR_COL_NUMBER_STRING: + if (in_array(ordered_tables, expr->u.column.parsed.table)) + return JOIN_TO_CONST_EXPR; + *lastused = expr->u.column.parsed.table; + return CONST_EXPR; + case EXPR_STRCMP: + case EXPR_COMPLEX: + res = reorder_check(expr->u.expr.right, ordered_tables, process_joins, lastused); + /* fall through */ + case EXPR_UNARY: + res += reorder_check(expr->u.expr.left, ordered_tables, process_joins, lastused); + if (res == 0) + return 0; + if (res == CONST_EXPR) + add_to_array(ordered_tables, *lastused); + if (process_joins && res == JOIN_TO_CONST_EXPR + CONST_EXPR) + add_to_array(ordered_tables, *lastused); + return res; + default: + ERR("Unkown expr type: %i\n", expr->type); + assert(0); + return 0x1000000; + } +} + +/* reorders the tablelist in a way to evaluate the condition as fast as possible */ +static JOINTABLE **ordertables( MSIWHEREVIEW *wv ) +{ + JOINTABLE *table; + JOINTABLE **tables; + + tables = msi_alloc_zero( (wv->table_count + 1) * sizeof(*tables) ); + + if (wv->cond) + { + table = NULL; + reorder_check(wv->cond, tables, FALSE, &table); + table = NULL; + reorder_check(wv->cond, tables, TRUE, &table); + } + + table = wv->tables; + while (table) + { + add_to_array(tables, table); + table = table->next; + } + return tables; +} + static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; UINT r; JOINTABLE *table = wv->tables; UINT *rows; - int i; + JOINTABLE **ordered_tables; + int i = 0; TRACE("%p %p\n", wv, record); @@ -714,11 +798,13 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) } while ((table = table->next)); + ordered_tables = ordertables( wv ); + rows = msi_alloc( wv->table_count * sizeof(*rows) ); for (i = 0; i < wv->table_count; i++) rows[i] = INVALID_ROW_INDEX; - r = check_condition(wv, record, wv->tables, rows); + r = check_condition(wv, record, ordered_tables, rows); if (wv->order_info) wv->order_info->error = ERROR_SUCCESS; @@ -729,6 +815,7 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) r = wv->order_info->error; msi_free( rows ); + msi_free( ordered_tables ); return r; }

1 0