February 2006 - Wine-commits

Phil Lodwick : winsock/tests: Add a todo_wine test for select.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 6495e66b3a26be98734f34545826651147bbeb81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6495e66b3a26be98734f345… Author: Phil Lodwick <Phil.Lodwick(a)efi.com> Date: Thu Feb 2 13:50:41 2006 +0100 winsock/tests: Add a todo_wine test for select. --- dlls/winsock/tests/sock.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/winsock/tests/sock.c b/dlls/winsock/tests/sock.c index d09976d..13f4173 100644 --- a/dlls/winsock/tests/sock.c +++ b/dlls/winsock/tests/sock.c @@ -1317,6 +1317,30 @@ static void test_WSAStringToAddressW(voi "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); } +static void test_select(void) +{ + SOCKET fd; + + fd = socket(AF_INET, SOCK_STREAM, 0); + if (fd != INVALID_SOCKET) + { + fd_set readfds; + struct timeval select_timeout; + + FD_ZERO(&readfds); + FD_SET(fd, &readfds); + select_timeout.tv_sec=2; + select_timeout.tv_usec=0; + + todo_wine { + if (select((int) fd+1, &readfds, NULL, NULL, &select_timeout) != SOCKET_ERROR) + ok(!FD_ISSET(fd, &readfds), "FD should not be set\n"); + } + + closesocket(fd); + } +} + /**************** Main program ***************/ START_TEST( sock ) @@ -1344,5 +1368,7 @@ START_TEST( sock ) test_WSAStringToAddressA(); test_WSAStringToAddressW(); + test_select(); + Exit(); }

1 0

Detlef Riekenberg : winspool/tests: Filter more results.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 9cf319d76d46ab310f6b01db968b97022ea03e17 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9cf319d76d46ab310f6b01d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 2 13:50:36 2006 +0100 winspool/tests: Filter more results. --- dlls/winspool/tests/info.c | 111 ++++++++++++++++++++++++-------------------- 1 files changed, 60 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9cf319d76d46ab310f6…

1 0

Vitaliy Margolen : winecfg: Remove color depth. It's source of problems for number of users.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 4e20622e4dc35c8513800cb25e346ac3778b11bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e20622e4dc35c8513800cb… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Thu Feb 2 13:41:46 2006 +0100 winecfg: Remove color depth. It's source of problems for number of users. --- programs/winecfg/Bg.rc | 3 -- programs/winecfg/Cs.rc | 3 -- programs/winecfg/De.rc | 3 -- programs/winecfg/En.rc | 34 +++++++++++--------------- programs/winecfg/Es.rc | 3 -- programs/winecfg/Fi.rc | 3 -- programs/winecfg/Fr.rc | 3 -- programs/winecfg/It.rc | 3 -- programs/winecfg/Ja.rc | 3 -- programs/winecfg/Ko.rc | 3 -- programs/winecfg/Nl.rc | 3 -- programs/winecfg/No.rc | 3 -- programs/winecfg/Pt.rc | 3 -- programs/winecfg/Ru.rc | 32 ++++++++++++------------- programs/winecfg/resource.h | 1 - programs/winecfg/x11drvdlg.c | 54 +++--------------------------------------- 16 files changed, 33 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4e20622e4dc35c85138…

1 0

Phil Krylov : gdi: Slant font automatically if no italic variant exists.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 8d643a7324e12357bbc3fc39463f445cf2285733 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d643a7324e12357bbc3fc3… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Thu Feb 2 13:41:54 2006 +0100 gdi: Slant font automatically if no italic variant exists. --- dlls/gdi/freetype.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index c4af124..a983d25 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -2828,6 +2828,18 @@ DWORD WineEngGetGlyphOutline(GdiFont fon needsTransform = TRUE; } + /* Slant transform */ + if (font->fake_italic) { + FT_Matrix slantMat; + + slantMat.xx = (1 << 16); + slantMat.xy = ((1 << 16) >> 2); + slantMat.yx = 0; + slantMat.yy = (1 << 16); + pFT_Matrix_Multiply(&slantMat, &transMat); + needsTransform = TRUE; + } + /* Rotation transform */ if(font->orientation) { FT_Matrix rotationMat;

1 0

Vitaly Budovski : wined3d: Added support for ARB_POINT_PARAMETERS.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: d599037c4e0857e55ce0e0d42112181533bc080b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d599037c4e0857e55ce0e0d… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Thu Feb 2 13:50:31 2006 +0100 wined3d: Added support for ARB_POINT_PARAMETERS. --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 07543bb..7aa8d5d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -543,6 +543,9 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine } else if (strcmp(ThisExtn, "GL_ARB_occlusion_query") == 0) { TRACE_(d3d_caps)(" FOUND: ARB Occlusion Query support\n"); gl_info->supported[ARB_OCCLUSION_QUERY] = TRUE; + } else if (strcmp(ThisExtn, "GL_ARB_point_parameters") == 0) { + TRACE_(d3d_caps)(" FOUND: ARB Point parameters support\n"); + gl_info->supported[ARB_POINT_PARAMETERS] = TRUE; /** * EXT */

1 0

Michael Jung : shell32: Create /home/julliard targeted symbolic links during SHELL_RegisterFolders.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 77474f8a1464f81d273b33283a1b66a300860231 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77474f8a1464f81d273b332… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Thu Feb 2 13:28:29 2006 +0100 shell32: Create $HOME targeted symbolic links during SHELL_RegisterFolders. --- dlls/shell32/shellpath.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 188 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f60397e..4c18539 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -27,6 +27,7 @@ #include "config.h" #include "wine/port.h" +#include <stdio.h> #include <stdarg.h> #include <string.h> #include <ctype.h> @@ -1926,13 +1927,199 @@ static HRESULT _SHRegisterCommonShellFol return hr; } +/****************************************************************************** + * _SHAppendToUnixPath [Internal] + * + * Helper function for _SHCreateSymbolicLinks. Appends pwszSubPath (or the + * corresponding resource, if IS_INTRESOURCE) to the unix base path 'szBasePath' + * and replaces backslashes with slashes. + * + * PARAMS + * szBasePath [IO] The unix base path, which will be appended to (CP_UNXICP). + * pwszSubPath [I] Sub-path or resource id (use MAKEINTRESOURCEW). + * + * RETURNS + * Success: TRUE, + * Failure: FALSE + */ +static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) { + WCHAR wszSubPath[MAX_PATH]; + int cLen = strlen(szBasePath); + char *pBackslash; + + if (IS_INTRESOURCE(pwszSubPath)) { + if (!LoadStringW(shell32_hInstance, LOWORD(pwszSubPath), wszSubPath, MAX_PATH)) { + /* Fall back to hard coded defaults. */ + switch (LOWORD(pwszSubPath)) { + case IDS_PERSONAL: + lstrcpyW(wszSubPath, PersonalW); + break; + case IDS_MYMUSIC: + lstrcpyW(wszSubPath, My_MusicW); + break; + case IDS_MYPICTURES: + lstrcpyW(wszSubPath, My_PicturesW); + break; + case IDS_MYVIDEO: + lstrcpyW(wszSubPath, My_VideoW); + break; + default: + ERR("LoadString(%d) failed!\n", LOWORD(pwszSubPath)); + return FALSE; + } + } + } else { + lstrcpyW(wszSubPath, pwszSubPath); + } + + if (szBasePath[cLen-1] != '/') szBasePath[cLen++] = '/'; + + if (!WideCharToMultiByte(CP_UNIXCP, 0, wszSubPath, -1, szBasePath + cLen, + FILENAME_MAX - cLen, NULL, NULL)) + { + return FALSE; + } + + pBackslash = szBasePath + cLen; + while ((pBackslash = strchr(pBackslash, '\\'))) *pBackslash = '/'; + + return TRUE; +} + +/****************************************************************************** + * _SHCreateSymbolicLinks [Internal] + * + * Sets up symbol links for various shell folders to point into the users home + * directory. We do an educated guess about what the user would probably want: + * - If there is a 'My Documents' directory in $HOME, the user probably wants + * wine's 'My Documents' to point there. Furthermore, we imply that the user + * is a Windows lover and has no problem with wine creating 'My Pictures', + * 'My Music' and 'My Video' subfolders under '$HOME/My Documents', if those + * do not already exits. We put appropriate symbolic links in place for those, + * too. + * - If there is no 'My Documents' directory in $HOME, we let 'My Documents' + * point directly to $HOME. We assume the user to be a unix hacker who does not + * want wine to create anything anywhere besides the .wine directory. So, if + * there already is a 'My Music' directory in $HOME, we symlink the 'My Music' + * shell folder to it. But if not, we symlink it to $HOME directly. The same + * holds fo 'My Pictures' and 'My Video'. + * - The Desktop shell folder is symlinked to '$HOME/Desktop', if that does + * exists and left alone if not. + * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) + */ +static void _SHCreateSymbolicLinks() +{ + UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEO, IDS_MYMUSIC }, i; + int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; + WCHAR wszTempPath[MAX_PATH]; + char szPersonalTarget[FILENAME_MAX], *pszPersonal; + char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; + char szDesktopTarget[FILENAME_MAX], *pszDesktop; + struct stat statFolder; + const char *pszHome; + HRESULT hr; + + /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ + hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_DEFAULT, wszTempPath); + if (FAILED(hr)) return; + pszPersonal = wine_get_unix_file_name(wszTempPath); + if (!pszPersonal) return; + + pszHome = getenv("HOME"); + if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) { + strcpy(szPersonalTarget, pszHome); + if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && + !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + { + /* '$HOME/My Documents' exists. Create 'My Pictures', 'My Videos' and + * 'My Music' subfolders or fail silently if they already exist. */ + for (i = 0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) + mkdir(szMyStuffTarget, S_IRWXU|S_IRWXG|S_IRWXO); + } + } + else + { + /* '$HOME/My Documents' doesn't exists, but '$HOME' does. */ + strcpy(szPersonalTarget, pszHome); + } + + /* Replace 'My Documents' directory with a symlink of fail silently if not empty. */ + rmdir(pszPersonal); + symlink(szPersonalTarget, pszPersonal); + } + else + { + /* '$HOME' doesn't exist. Create 'My Pictures', 'My Videos' and 'My Music' subdirs + * in '%USERPROFILE%\\My Documents' or fail silently if they already exist. */ + strcpy(szPersonalTarget, pszPersonal); + for (i = 0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) + mkdir(szMyStuffTarget, S_IRWXU|S_IRWXG|S_IRWXO); + } + } + + HeapFree(GetProcessHeap(), 0, pszPersonal); + + /* Create symbolic links for 'My Pictures', 'My Video' and 'My Music'. */ + for (i=0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { + /* Create the current 'My Whatever' folder and get it's unix path. */ + hr = SHGetFolderPathW(NULL, acsidlMyStuff[i]|CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_DEFAULT, wszTempPath); + if (FAILED(hr)) continue; + pszMyStuff = wine_get_unix_file_name(wszTempPath); + if (!pszMyStuff) continue; + + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i])) && + !stat(szMyStuffTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + { + /* If there's a 'My Whatever' directory where 'My Documents' links to, link to it. */ + rmdir(pszMyStuff); + symlink(szMyStuffTarget, pszMyStuff); + } + else + { + /* Else link to where 'My Documents' itself links to. */ + rmdir(pszMyStuff); + symlink(szPersonalTarget, pszMyStuff); + } + HeapFree(GetProcessHeap(), 0, pszMyStuff); + } + + /* Last but not least, the Desktop folder */ + strcpy(szDesktopTarget, pszHome); + if (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && + !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + { + hr = SHGetFolderPathW(NULL, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_DEFAULT, wszTempPath); + if (SUCCEEDED(hr) && (pszDesktop = wine_get_unix_file_name(wszTempPath))) + { + rmdir(pszDesktop); + symlink(szDesktopTarget, pszDesktop); + HeapFree(GetProcessHeap(), 0, pszDesktop); + } + } +} + /* Register the default values in the registry, as some apps seem to depend * on their presence. The set registered was taken from Windows XP. */ HRESULT SHELL_RegisterShellFolders(void) { - HRESULT hr = _SHRegisterUserShellFolders(TRUE); + HRESULT hr; + /* Set up '$HOME' targeted symlinks for 'My Documents', 'My Pictures', + * 'My Video', 'My Music' and 'Desktop' in advance, so that the + * _SHRegister*ShellFolders() functions will find everything nice and clean + * and thus will not attempt to create them in the profile directory. */ + _SHCreateSymbolicLinks(); + + hr = _SHRegisterUserShellFolders(TRUE); if (SUCCEEDED(hr)) hr = _SHRegisterUserShellFolders(FALSE); if (SUCCEEDED(hr))

1 0

Michael Jung : shell32: Move 'My Pictures', 'My Videos' and 'My Music' folders
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 32aed7c93e88356ae8fdf8d8efad5ea076b68fcb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32aed7c93e88356ae8fdf8d… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Thu Feb 2 13:28:05 2006 +0100 shell32: Move 'My Pictures', 'My Videos' and 'My Music' folders directly to %USERPROFILE% (instead of %USERPROFILE%\\My Documents), to allow for reasonable symbolic linking to $HOME based directories. --- dlls/shell32/shell32_Bg.rc | 6 +++--- dlls/shell32/shell32_De.rc | 6 +++--- dlls/shell32/shell32_En.rc | 6 +++--- dlls/shell32/shell32_Es.rc | 6 +++--- dlls/shell32/shell32_Fi.rc | 6 +++--- dlls/shell32/shell32_Fr.rc | 6 +++--- dlls/shell32/shell32_Ko.rc | 6 +++--- dlls/shell32/shell32_No.rc | 6 +++--- dlls/shell32/shell32_Pt.rc | 6 +++--- dlls/shell32/shell32_Ru.rc | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=32aed7c93e88356ae8f…

1 0

Huw Davies : opengl: Sync a dibsection to its pixmap before drawing to it via opengl.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 13268261bbe0d4013937a6a9804fbda378244512 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13268261bbe0d4013937a6a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 2 13:23:55 2006 +0100 opengl: Sync a dibsection to its pixmap before drawing to it via opengl. --- dlls/opengl32/opengl_ext.h | 3 ++- dlls/opengl32/wgl.c | 22 +++++++++++++++++++++- dlls/x11drv/init.c | 10 ++++++++-- dlls/x11drv/x11drv.h | 3 ++- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 274f8d3..ad176c4 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -58,7 +58,8 @@ extern void (*wine_tsx11_lock_ptr)(void) extern void (*wine_tsx11_unlock_ptr)(void); /* As GLX relies on X, this is needed */ -#define ENTER_GL() wine_tsx11_lock_ptr() +void enter_gl(void); +#define ENTER_GL() enter_gl() #define LEAVE_GL() wine_tsx11_unlock_ptr() diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index afb4c86..04eb40f 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -54,7 +54,8 @@ enum x11drv_escape_codes X11DRV_END_EXPOSURES, /* end graphics exposures */ X11DRV_GET_DCE, /* get the DCE pointer */ X11DRV_SET_DCE, /* set the DCE pointer */ - X11DRV_GET_GLX_DRAWABLE /* get current glx drawable for a DC */ + X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ + X11DRV_SYNC_PIXMAP /* sync the dibsection to its pixmap */ }; void (*wine_tsx11_lock_ptr)(void) = NULL; @@ -88,6 +89,25 @@ static inline Wine_GLContext *get_contex return ret; } +void enter_gl(void) +{ + GLXContext gl_ctx; + Wine_GLContext *ctx; + enum x11drv_escape_codes escape = X11DRV_SYNC_PIXMAP; + + wine_tsx11_lock_ptr(); + gl_ctx = glXGetCurrentContext(); + if(!gl_ctx) return; + ctx = get_context_from_GLXContext(gl_ctx); + wine_tsx11_unlock_ptr(); /* unlock before calling GDI apis */ + + if(ctx && GetObjectType(ctx->hdc) == OBJ_MEMDC) + ExtEscape(ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, 0, NULL); + + wine_tsx11_lock_ptr(); + return; +} + static inline void free_context(Wine_GLContext *context) { if (context->next != NULL) context->next->prev = context->prev; diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c index c2729b4..9774c6f 100644 --- a/dlls/x11drv/init.c +++ b/dlls/x11drv/init.c @@ -414,8 +414,6 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *ph { if(!physDev->bitmap->glxpixmap) physDev->bitmap->glxpixmap = create_glxpixmap(physDev); - - X11DRV_CoerceDIBSection(physDev, DIB_Status_GdiMod, FALSE); *(Drawable *)out_data = physDev->bitmap->glxpixmap; } else @@ -423,6 +421,14 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *ph return TRUE; } break; + case X11DRV_SYNC_PIXMAP: + if(physDev->bitmap) + { + X11DRV_CoerceDIBSection(physDev, DIB_Status_GdiMod, FALSE); + return TRUE; + } + return FALSE; + break; } } break; diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index 21b28d5..0339fad 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -480,7 +480,8 @@ enum x11drv_escape_codes X11DRV_END_EXPOSURES, /* end graphics exposures */ X11DRV_GET_DCE, /* get the DCE pointer */ X11DRV_SET_DCE, /* set the DCE pointer */ - X11DRV_GET_GLX_DRAWABLE /* get current glx drawable for a DC */ + X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ + X11DRV_SYNC_PIXMAP /* sync the dibsection to its pixmap */ }; struct x11drv_escape_set_drawable

1 0

Michael Jung : shell32: Get rid of the magic MyDocuments->/home/julliard mapping code.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 7a893cbe7acc973203f12010658ee36f84312256 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a893cbe7acc973203f1201… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Thu Feb 2 13:27:42 2006 +0100 shell32: Get rid of the magic MyDocuments->$HOME mapping code. --- dlls/shell32/shellpath.c | 110 ---------------------------------------------- 1 files changed, 0 insertions(+), 110 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 29c004f..f60397e 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1229,66 +1229,6 @@ static HRESULT _SHGetUserShellFolderPath return hr; } -/* Helper function for _SHGetDefaultValue - * - * handing the directories under $HOME: - * 1) try path under $HOME (such as $HOME/My Documents/My Pictures), if it - * exists return it. - * 2) if not, but $HOME/My Documents exists return path 1 and have it created - * 3) try $HOME if it exists return it - * 4) normal fallback to C:/windows/Profiles/... - */ -static HRESULT expand_home_path(LPWSTR pszPath, LPCWSTR def_path, UINT resource, - BOOL create_lastdir) -{ - HRESULT hr = E_FAIL; - const char *home = getenv("HOME"); - - if (home) - { - LPWSTR homeW = wine_get_dos_file_name(home); - - if (homeW) - { - WCHAR resourcePath[MAX_PATH]; - lstrcpynW(pszPath, homeW, MAX_PATH); - - if (LoadStringW(shell32_hInstance, resource, resourcePath, MAX_PATH)) - PathAppendW(pszPath, resourcePath); - else - PathAppendW(pszPath, def_path); - - if (PathIsDirectoryW(pszPath)) hr = S_OK; - else if (create_lastdir) - { - /* attempt 2, try for My Documents */ - - WCHAR* ptr = strrchrW(pszPath, '\\'); - if (ptr) - { - *ptr = 0; - if (PathIsDirectoryW(pszPath)) - { - *ptr = '\\'; - hr = S_OK; - } - } - } - - if (hr != S_OK) - { - /* attempt 3 return HOME */ - lstrcpyW(pszPath,homeW); - hr = S_OK; - } - HeapFree(GetProcessHeap(), 0, homeW); - } - else - hr = HRESULT_FROM_WIN32(GetLastError()); - } - return hr; -} - /* Gets a 'semi-expanded' default value of the CSIDL with index folder into * pszPath, based on the entries in CSIDL_Data. By semi-expanded, I mean: * - The entry's szDefaultPath may be either a string value or an integer @@ -1316,56 +1256,6 @@ static HRESULT _SHGetDefaultValue(BYTE f if (!pszPath) return E_INVALIDARG; - /* Try special cases first */ - hr = E_FAIL; - switch (folder) - { - case CSIDL_MYPICTURES: - hr = expand_home_path(pszPath,My_PicturesW,IDS_MYPICTURES,TRUE); - break; - case CSIDL_PERSONAL: - hr = expand_home_path(pszPath,PersonalW,IDS_PERSONAL,FALSE); - break; - case CSIDL_MYMUSIC: - hr = expand_home_path(pszPath,My_MusicW,IDS_MYMUSIC,TRUE); - break; - case CSIDL_MYVIDEO: - hr = expand_home_path(pszPath,My_VideoW,IDS_MYVIDEO,TRUE); - break; - case CSIDL_DESKTOP: - case CSIDL_DESKTOPDIRECTORY: - { - const char *home = getenv("HOME"); - - /* special case for Desktop, map to $HOME/Desktop if it exists */ - if (home) - { - LPWSTR homeW = wine_get_dos_file_name(home); - - if (homeW) - { - lstrcpynW(pszPath, homeW, MAX_PATH); - if (PathAppendW(pszPath, DesktopW)) - { - if (PathIsDirectoryW(pszPath)) - hr = S_OK; - } - else - hr = HRESULT_FROM_WIN32(GetLastError()); - HeapFree(GetProcessHeap(), 0, homeW); - } - else - hr = HRESULT_FROM_WIN32(GetLastError()); - } - break; - } - } - if (SUCCEEDED(hr)) - return hr; - - /* Either the folder was unhandled, or a suitable default wasn't found, - * so use one of the resource-based defaults - */ if (CSIDL_Data[folder].szDefaultPath && IS_INTRESOURCE(CSIDL_Data[folder].szDefaultPath)) {

1 0

Alexandre Julliard : widl: Some cosmetic fixes in generated code.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: a488901256f74887dfe17651a2673386554a0abc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a488901256f74887dfe1765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 13:23:28 2006 +0100 widl: Some cosmetic fixes in generated code. --- tools/widl/client.c | 2 +- tools/widl/proxy.c | 10 +++++----- tools/widl/server.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 1c3d187..91b4b39 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -233,7 +233,7 @@ static void write_function_stubs(type_t print_client("_RetVal = *("); write_type(client, def->type, def, def->tname); fprintf(client, " *)_StubMsg.Buffer;\n"); - fprintf(client, "_StubMsg.Buffer += sizeof("); + print_client("_StubMsg.Buffer += sizeof("); write_type(client, def->type, def, def->tname); fprintf(client, ");\n"); } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index a953ff5..97b471d 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -326,7 +326,7 @@ static void marshall_copy_arg( var_t *ar print_proxy( "*("); write_type(proxy, arg->type, arg, arg->tname); fprintf(proxy, " *)_StubMsg.Buffer = %s;\n", arg->name ); - fprintf(proxy, "_StubMsg.Buffer += sizeof("); + print_proxy("_StubMsg.Buffer += sizeof("); write_type(proxy, arg->type, arg, arg->tname); fprintf(proxy, ");\n"); break; @@ -425,7 +425,7 @@ static void unmarshall_copy_arg( var_t * print_proxy( "%s = *(", arg->name ); write_type(proxy, arg->type, arg, arg->tname); fprintf(proxy," *)_StubMsg.Buffer;\n"); - fprintf(proxy, "_StubMsg.Buffer += sizeof("); + print_proxy("_StubMsg.Buffer += sizeof("); write_type(proxy, arg->type, arg, arg->tname); fprintf(proxy, ");\n"); break; @@ -604,7 +604,7 @@ static void gen_proxy(type_t *iface, fun print_proxy( "_RetVal = *(" ); write_type(proxy, def->type, def, def->tname); fprintf(proxy, " *)_StubMsg.Buffer;\n"); - fprintf(proxy, "_StubMsg.Buffer += sizeof("); + print_proxy("_StubMsg.Buffer += sizeof("); write_type(proxy, def->type, def, def->tname); fprintf(proxy, ");\n"); } @@ -810,7 +810,7 @@ static void gen_stub(type_t *iface, func print_proxy( "*(" ); write_type(proxy, def->type, def, def->tname); fprintf(proxy, " *)_StubMsg.Buffer = _RetVal;\n"); - fprintf(proxy, "_StubMsg.Buffer += sizeof("); + print_proxy("_StubMsg.Buffer += sizeof("); write_type(proxy, def->type, def, def->tname); fprintf(proxy, ");\n"); } @@ -822,7 +822,7 @@ static void gen_stub(type_t *iface, func print_proxy("}\n"); print_proxy("RpcEndFinally\n"); - print_proxy("_Msg->BufferLength = ((long)_StubMsg.Buffer - (long)_Msg->Buffer);\n"); + print_proxy("_Msg->BufferLength = _StubMsg.Buffer - (unsigned char *)_Msg->Buffer;\n"); indent--; print_proxy("}\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 8bac800..23b303e 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -306,7 +306,7 @@ static void write_function_stubs(type_t print_server("*("); write_type(server, def->type, def, def->tname); fprintf(server, " *)_StubMsg.Buffer = _RetVal;\n"); - fprintf(server, "_StubMsg.Buffer += sizeof("); + print_server("_StubMsg.Buffer += sizeof("); write_type(server, def->type, def, def->tname); fprintf(server, ");\n"); }

1 0