wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Piotr Caban : wininet: Fix callbacks sent on connection error.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 4ba60d265a3543d6c4a0be8d4bcd0d306dbd96a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba60d265a3543d6c4a0be8d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 19 01:48:58 2010 +0200 wininet: Fix callbacks sent on connection error. --- dlls/wininet/http.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f72cf3b..9f96f8a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3668,7 +3668,7 @@ lend: HTTP_ReceiveRequestData(lpwhr, TRUE); else { - iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; + iar.dwResult = 0; iar.dwError = res; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, @@ -4360,6 +4360,10 @@ static DWORD HTTP_OpenConnection(http_request_t *lpwhr) if(res != ERROR_SUCCESS) goto lend; + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_CONNECTED_TO_SERVER, + szaddr, strlen(szaddr)+1); + if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) { /* Note: we differ from Microsoft's WinINet here. they seem to have @@ -4368,20 +4372,20 @@ static DWORD HTTP_OpenConnection(http_request_t *lpwhr) * behaviour to be more correct and to not cause any incompatibilities * because using a secure connection through a proxy server is a rare * case that would be hard for anyone to depend on */ - if (hIC->lpszProxy && (res = HTTP_SecureProxyConnect(lpwhr)) != ERROR_SUCCESS) + if (hIC->lpszProxy && (res = HTTP_SecureProxyConnect(lpwhr)) != ERROR_SUCCESS) { + HTTPREQ_CloseConnection(&lpwhr->hdr); goto lend; + } res = NETCON_secure_connect(&lpwhr->netConnection, lpwhs->lpszHostName); if(res != ERROR_SUCCESS) { WARN("Couldn't connect securely to host\n"); + HTTPREQ_CloseConnection(&lpwhr->hdr); goto lend; } } - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_CONNECTED_TO_SERVER, - szaddr, strlen(szaddr)+1); lend: lpwhr->read_pos = lpwhr->read_size = 0;

1 0

Damjan Jovanovic : wine.desktop: Associate with winemenubuilder' s application/x-ms-shortcut.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 8e10c65367b9bdf6dc9d4a2d44ca0f5817bfb0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e10c65367b9bdf6dc9d4a2d4… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 18 21:34:53 2010 +0200 wine.desktop: Associate with winemenubuilder's application/x-ms-shortcut. --- tools/wine.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 50489e1..f39ebca 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -20,7 +20,7 @@ Name[sr]=Wine - дизач Windows програма Name[sr@latin]=Wine - dizač Windows programa Name[hr]=Wine - dizač Windows programa Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk; +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk;application/x-ms-shortcut Icon=wine NoDisplay=true StartupNotify=true

1 0

Damjan Jovanovic : winemenubuilder: associate .lnk files with wine.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 0666c0da00ea3ddebc7baecefcb987e238b00330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0666c0da00ea3ddebc7baecef… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 18 21:33:03 2010 +0200 winemenubuilder: associate .lnk files with wine. --- programs/winemenubuilder/winemenubuilder.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 4dc08d5..9f10fdb 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1994,6 +1994,14 @@ static BOOL is_extension_blacklisted(LPCWSTR extension) return FALSE; } +static const char* get_special_mime_type(LPCWSTR extension) +{ + static const WCHAR lnkW[] = {'.','l','n','k',0}; + if (!strcmpiW(extension, lnkW)) + return "application/x-ms-shortcut"; + return NULL; +} + static BOOL write_freedesktop_association_entry(const char *desktopPath, const char *dot_extension, const char *friendlyAppName, const char *mimeType, const char *progId) @@ -2102,6 +2110,8 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package { if (contentTypeW != NULL && strchrW(contentTypeW, '/')) mimeTypeA = wchars_to_utf8_chars(contentTypeW); + else if ((get_special_mime_type(extensionW))) + mimeTypeA = strdupA(get_special_mime_type(extensionW)); else mimeTypeA = heap_printf("application/x-wine-extension-%s", &extensionA[1]);

1 0

Maarten Lankhorst : quartz: Add support for windowstate in video renderer.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 231396de90901675fdf5a8200d983af1409230c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=231396de90901675fdf5a8200… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 20:17:53 2010 +0200 quartz: Add support for windowstate in video renderer. --- dlls/quartz/videorenderer.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ed8f24e..845921c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1840,16 +1840,20 @@ static HRESULT WINAPI Videowindow_put_WindowState(IVideoWindow *iface, LONG WindowState) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, WindowState); - + TRACE("(%p/%p)->(%d)\n", This, iface, WindowState); + ShowWindow(This->hWnd, WindowState); return S_OK; } static HRESULT WINAPI Videowindow_get_WindowState(IVideoWindow *iface, LONG *WindowState) { + WINDOWPLACEMENT place; ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, WindowState); + place.length = sizeof(place); + GetWindowPlacement(This->hWnd, &place); + TRACE("(%p/%p)->(%p)\n", This, iface, WindowState); + *WindowState = place.showCmd; return S_OK; }

1 0

Maarten Lankhorst : mciqtz32: Add support for mciUpdate.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 6956ce61534862e1922dbc2e83b44c69cba5dab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6956ce61534862e1922dbc2e8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 20:16:57 2010 +0200 mciqtz32: Add support for mciUpdate. --- dlls/mciqtz32/Makefile.in | 2 +- dlls/mciqtz32/mciqtz.c | 71 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in index fde3f90..6dbdb87 100644 --- a/dlls/mciqtz32/Makefile.in +++ b/dlls/mciqtz32/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mciqtz32.dll -IMPORTS = strmiids oleaut32 ole32 winmm user32 kernel32 +IMPORTS = strmiids oleaut32 ole32 winmm user32 gdi32 kernel32 C_SRCS = \ mciqtz.c diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 005b1a3..4c9baf5 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -734,6 +734,74 @@ out: return ret; } +/****************************************************************************** + * MCIAVI_mciUpdate [internal] + */ +static DWORD MCIQTZ_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS lpParms) +{ + WINE_MCIQTZ *wma; + DWORD res = 0; + + TRACE("%04x, %08x, %p\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_DGV_UPDATE_HDC) { + IBasicVideo *vidbasic; + IVideoWindow *vidwin; + res = MCIERR_INTERNAL; + IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); + IFilterGraph2_QueryInterface(wma->pgraph, &IID_IBasicVideo, (void**)&vidbasic); + if (vidbasic && vidwin) { + LONG state, size; + BYTE *data; + BITMAPINFO *info; + HRESULT hr; + RECT src, dest; + + /* If in stopped state, nothing has been drawn to screen + * moving to pause, which is needed for the old dib renderer, will result + * in a single frame drawn, so hide the window here */ + IVideoWindow_put_Visible(vidwin, OAFALSE); + /* FIXME: Should we check the original state and restore it? */ + IMediaControl_Pause(wma->pmctrl); + IMediaControl_GetState(wma->pmctrl, -1, &state); + if (FAILED(hr = IBasicVideo_GetCurrentImage(vidbasic, &size, NULL))) { + WARN("Could not get image size (hr = %x)\n", hr); + goto out; + } + data = HeapAlloc(GetProcessHeap(), 0, size); + info = (BITMAPINFO*)data; + IBasicVideo_GetCurrentImage(vidbasic, &size, (LONG*)data); + data += info->bmiHeader.biSize; + + IBasicVideo_GetSourcePosition(vidbasic, &src.left, &src.top, &src.right, &src.bottom); + IBasicVideo_GetDestinationPosition(vidbasic, &dest.left, &dest.top, &dest.right, &dest.bottom); + StretchDIBits(lpParms->hDC, + dest.left, dest.top, dest.right + dest.left, dest.bottom + dest.top, + src.left, src.top, src.right + src.left, src.bottom + src.top, + data, info, DIB_RGB_COLORS, SRCCOPY); + HeapFree(GetProcessHeap(), 0, data); + } + res = 0; +out: + if (vidbasic) + IBasicVideo_Release(vidbasic); + if (vidwin) { + IVideoWindow_put_Visible(vidwin, OATRUE); + IVideoWindow_Release(vidwin); + } + } + else if (dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + return res; +} + /*************************************************************************** * MCIQTZ_mciSetAudio [internal] */ @@ -797,6 +865,8 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_WHERE: return MCIQTZ_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: return MCIQTZ_mciSetAudio (dwDevID, dwParam1, (LPMCI_DGV_SETAUDIO_PARMSW) dwParam2); + case MCI_UPDATE: + return MCIQTZ_mciUpdate(dwDevID, dwParam1, (LPMCI_DGV_UPDATE_PARMS)dwParam2); case MCI_RECORD: case MCI_PAUSE: case MCI_RESUME: @@ -808,7 +878,6 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_FREEZE: case MCI_REALIZE: case MCI_UNFREEZE: - case MCI_UPDATE: case MCI_STEP: case MCI_COPY: case MCI_CUT:

1 0

Maarten Lankhorst : mciqtz32: Add support for MCI_DGV_WHERE_SOURCE.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: e51d5af9d6538431ddc623d9e6ff2f455ac536a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51d5af9d6538431ddc623d9e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 20:16:18 2010 +0200 mciqtz32: Add support for MCI_DGV_WHERE_SOURCE. --- dlls/mciqtz32/mciqtz.c | 38 ++++++++++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index cdd0c33..005b1a3 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -639,9 +639,11 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp { WINE_MCIQTZ* wma; IVideoWindow* pVideoWindow; + IBasicVideo *pBasicVideo; HRESULT hr; HWND hWnd; RECT rc; + DWORD ret = MCIERR_UNRECOGNIZED_COMMAND; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -659,19 +661,31 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp return MCIERR_INTERNAL; } + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); + if (FAILED(hr)) { + ERR("Cannot get IBasicVideo interface (hr = %x)\n", hr); + IUnknown_Release(pVideoWindow); + return MCIERR_INTERNAL; + } + hr = IVideoWindow_get_Owner(pVideoWindow, (OAHWND*)&hWnd); - IVideoWindow_Release(pVideoWindow); if (FAILED(hr)) { TRACE("No video stream, returning no window error\n"); + IUnknown_Release(pVideoWindow); return MCIERR_NO_WINDOW; } if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) - FIXME("MCI_DGV_WHERE_SOURCE_MAX not supported yet\n"); - else - FIXME("MCI_DGV_WHERE_SOURCE not supported yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + FIXME("MCI_DGV_WHERE_SOURCE_MAX stub %s\n", wine_dbgstr_rect(&rc)); + IBasicVideo_get_SourceLeft(pBasicVideo, &rc.left); + IBasicVideo_get_SourceTop(pBasicVideo, &rc.top); + IBasicVideo_get_SourceWidth(pBasicVideo, &rc.right); + IBasicVideo_get_SourceHeight(pBasicVideo, &rc.bottom); + /* Undo conversion done below */ + rc.right += rc.left; + rc.bottom += rc.top; + TRACE("MCI_DGV_WHERE_SOURCE %s\n", wine_dbgstr_rect(&rc)); } if (dwFlags & MCI_DGV_WHERE_DESTINATION) { if (dwFlags & MCI_DGV_WHERE_MAX) { @@ -679,7 +693,7 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp TRACE("MCI_DGV_WHERE_DESTINATION_MAX %s\n", wine_dbgstr_rect(&rc)); } else { FIXME("MCI_DGV_WHERE_DESTINATION not supported yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + goto out; } } if (dwFlags & MCI_DGV_WHERE_FRAME) { @@ -687,14 +701,14 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp FIXME("MCI_DGV_WHERE_FRAME_MAX not supported yet\n"); else FIXME("MCI_DGV_WHERE_FRAME not supported yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + goto out; } if (dwFlags & MCI_DGV_WHERE_VIDEO) { if (dwFlags & MCI_DGV_WHERE_MAX) FIXME("MCI_DGV_WHERE_VIDEO_MAX not supported yet\n"); else FIXME("MCI_DGV_WHERE_VIDEO not supported yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + goto out; } if (dwFlags & MCI_DGV_WHERE_WINDOW) { if (dwFlags & MCI_DGV_WHERE_MAX) { @@ -705,15 +719,19 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp TRACE("MCI_DGV_WHERE_WINDOW %s\n", wine_dbgstr_rect(&rc)); } } + ret = 0; +out: /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height * So convert the normal RECT into a MCI RECT before returning */ + IVideoWindow_Release(pVideoWindow); + IBasicVideo_Release(pBasicVideo); lpParms->rc.left = rc.left; - lpParms->rc.top = rc.right; + lpParms->rc.top = rc.top; lpParms->rc.right = rc.right - rc.left; lpParms->rc.bottom = rc.bottom - rc.top; - return 0; + return ret; } /***************************************************************************

1 0

Maarten Lankhorst : mciqtz32: Handle mciOpen better.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 4eddb852b12e516e6976768edcbca858e131af88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eddb852b12e516e6976768ed… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 20:14:07 2010 +0200 mciqtz32: Handle mciOpen better. --- dlls/mciqtz32/mciqtz.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 36a7fcb..cdd0c33 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -145,6 +145,8 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, { WINE_MCIQTZ* wma; HRESULT hr; + IBasicVideo *vidbasic; + IVideoWindow *vidwin; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); @@ -190,6 +192,31 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, goto err; } + hr = IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); + if (SUCCEEDED(hr)) + hr = IFilterGraph2_QueryInterface(wma->pgraph, &IID_IBasicVideo, (void**)&vidbasic); + if (SUCCEEDED(hr)) { + DWORD style; + RECT rc = { 0, 0, 0, 0 }; + IVideoWindow_put_AutoShow(vidwin, OAFALSE); + style = 0; + if (dwFlags & MCI_DGV_OPEN_WS) + style |= lpOpenParms->dwStyle; + if (dwFlags & MCI_DGV_OPEN_PARENT) { + style |= WS_CHILD; + IVideoWindow_put_MessageDrain(vidwin, (OAHWND)lpOpenParms->hWndParent); + IVideoWindow_put_WindowState(vidwin, SW_HIDE); + IVideoWindow_put_Owner(vidwin, (OAHWND)lpOpenParms->hWndParent); + } + IVideoWindow_put_WindowStyle(vidwin, style); + IBasicVideo_GetVideoSize(vidbasic, &rc.right, &rc.bottom); + IVideoWindow_SetWindowPosition(vidwin, rc.left, rc.top, rc.right, rc.bottom); + IVideoWindow_put_Visible(vidwin, OATRUE); + IBasicVideo_Release(vidbasic); + } + if (vidwin) + IVideoWindow_Release(vidwin); + wma->opened = TRUE; return 0;

1 0

Alexandre Julliard : configure: Add a compatibility macro for AS_VAR_IF.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 4ddfba41af1dbff3eecbaf3def938e151be58e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ddfba41af1dbff3eecbaf3de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 11:52:47 2010 +0200 configure: Add a compatibility macro for AS_VAR_IF. --- configure.ac | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 46dca8e..1e5ac7c 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,14 @@ AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_AUX_DIR(tools) -dnl autoconf versions before 2.63b don't have AS_VAR_APPEND +dnl autoconf versions before 2.63b don't have AS_VAR_APPEND or AS_VAR_IF m4_ifdef([AS_VAR_APPEND],,[as_fn_append () { eval $[1]=\$$[1]\$[2]; } AC_DEFUN([AS_VAR_APPEND],[as_fn_append $1 $2])])dnl +m4_ifdef([AS_VAR_IF],,[AC_DEFUN([AS_VAR_IF], +[AS_LITERAL_IF([$1], + [AS_IF([test "x$$1" = x""$2], [$3], [$4])], + [eval as_val=\$$1 + AS_IF([test "x$as_val" = x""$2], [$3], [$4])])])])dnl dnl **** Command-line arguments ****

1 0

Alexandre Julliard : winex11: Make sure that all fontconfig support is properly #ifdef'ed.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: b81d08e31c512e66c33779935e9668a648e38409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81d08e31c512e66c33779935… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 11:26:44 2010 +0200 winex11: Make sure that all fontconfig support is properly #ifdef'ed. --- dlls/winex11.drv/xrender.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 9678def..b7e0c2f 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -194,6 +194,7 @@ MAKE_FUNCPTR(FcPatternDestroy) MAKE_FUNCPTR(FcPatternAddInteger) MAKE_FUNCPTR(FcPatternAddString) MAKE_FUNCPTR(FcPatternGetInteger) +static void *fontconfig_handle; static BOOL fontconfig_installed; #endif @@ -341,7 +342,6 @@ static int load_xrender_formats(void) void X11DRV_XRender_Init(void) { int event_base, i; - void *fontconfig_handle; if (client_side_with_render && wine_dlopen(SONAME_LIBX11, RTLD_NOW|RTLD_GLOBAL, NULL, 0) && @@ -395,6 +395,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) } } +#ifdef SONAME_LIBFONTCONFIG if ((fontconfig_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0))) { #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fontconfig_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} @@ -411,6 +412,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) fontconfig_installed = pFcInit(); } else TRACE( "cannot find the fontconfig library " SONAME_LIBFONTCONFIG "\n" ); +#endif sym_not_found: if(X11DRV_XRender_Installed || client_side_with_core)

1 0

Alexandre Julliard : winecfg: Don' t crash when DllOverrides contain invalid values.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: fa4d3becf65575194f375a74640de8e8d2ed6e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4d3becf65575194f375a746… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 11:26:29 2010 +0200 winecfg: Don't crash when DllOverrides contain invalid values. --- programs/winecfg/libraries.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 19504d6..e402b4e 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -136,7 +136,7 @@ static const char* mode_to_string(enum dllmode mode) case NATIVE_BUILTIN: return "native,builtin"; case BUILTIN_NATIVE: return "builtin,native"; case DISABLE: return ""; - default: assert(FALSE); return ""; + default: return ""; } } @@ -153,7 +153,7 @@ static const char* mode_to_label(enum dllmode mode) case NATIVE_BUILTIN: id = IDS_DLL_NATIVE_BUILTIN; break; case BUILTIN_NATIVE: id = IDS_DLL_BUILTIN_NATIVE; break; case DISABLE: id = IDS_DLL_DISABLED; break; - default: assert(FALSE); + default: return "??"; } if (!LoadStringA( GetModuleHandleA(NULL), id, buffer, sizeof(buffer) )) buffer[0] = 0; return buffer; @@ -183,7 +183,7 @@ static DWORD mode_to_id(enum dllmode mode) case NATIVE_BUILTIN: return IDC_RAD_NATIVE_BUILTIN; case BUILTIN_NATIVE: return IDC_RAD_BUILTIN_NATIVE; case DISABLE: return IDC_RAD_DISABLE; - default: assert( FALSE ); return 0; /* should not be reached */ + default: return IDC_RAD_BUILTIN_NATIVE; } }

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010