February 2007 - Wine-commits

Stefan Dösinger : wined3d: BeginScene and EndScene tests and fixes.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: 67b1f4a7e927905223d49b2f015bdad50a5374c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b1f4a7e927905223d49b2f0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 9 16:35:45 2007 +0100 wined3d: BeginScene and EndScene tests and fixes. --- dlls/d3d8/tests/device.c | 64 +++++++++++++++++ dlls/d3d9/tests/device.c | 153 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/device.c | 15 +++- dlls/ddraw/tests/d3d.c | 36 +++++++++ dlls/wined3d/device.c | 21 +++++- dlls/wined3d/surface.c | 17 +++++ dlls/wined3d/wined3d_private.h | 4 +- 7 files changed, 300 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67b1f4a7e927905223d49…

1 0

Stefan Dösinger : wined3d: Make shader_cleanup more useful.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: fa97fbdcad4385d2b730bdecdaa4367337a9133f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa97fbdcad4385d2b730bdecd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 8 22:31:01 2007 +0100 wined3d: Make shader_cleanup more useful. --- dlls/wined3d/arb_program_shader.c | 8 +++++--- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3e4e38a..e6f9510 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -986,9 +986,11 @@ static void shader_arb_select_depth_blt( glEnable(GL_FRAGMENT_PROGRAM_ARB); } -static void shader_arb_cleanup(BOOL usePS, BOOL useVS) { - if (useVS) glDisable(GL_VERTEX_PROGRAM_ARB); - if (usePS) glDisable(GL_FRAGMENT_PROGRAM_ARB); +static void shader_arb_cleanup(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + WineD3D_GL_Info *gl_info = &((IWineD3DImpl *)(This->wineD3D))->gl_info; + if (GL_SUPPORT(ARB_VERTEX_PROGRAM)) glDisable(GL_VERTEX_PROGRAM_ARB); + if (GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) glDisable(GL_FRAGMENT_PROGRAM_ARB); } const shader_backend_t arb_program_shader_backend = { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 6949be1..8428b47 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -980,7 +980,7 @@ void shader_delete_constant_list( static void shader_none_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {} static void shader_none_select_depth_blt(IWineD3DDevice *iface) {} static void shader_none_load_constants(IWineD3DDevice *iface, char usePS, char useVS) {} -static void shader_none_cleanup(BOOL usePS, BOOL useVS) {} +static void shader_none_cleanup(IWineD3DDevice *iface) {} const shader_backend_t none_shader_backend = { &shader_none_select, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5fd6c5a..30d0e52 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2161,8 +2161,10 @@ static void shader_glsl_select_depth_blt GL_EXTCALL(glUniform1iARB(loc, 0)); } -static void shader_glsl_cleanup(BOOL usePS, BOOL useVS) { - /* Nothing to do */ +static void shader_glsl_cleanup(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + WineD3D_GL_Info *gl_info = &((IWineD3DImpl *)(This->wineD3D))->gl_info; + GL_EXTCALL(glUseProgramObjectARB(0)); } const shader_backend_t glsl_shader_backend = { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c1c36b0..0008834 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -177,7 +177,7 @@ typedef struct { void (*shader_select)(IWineD3DDevice *iface, BOOL usePS, BOOL useVS); void (*shader_select_depth_blt)(IWineD3DDevice *iface); void (*shader_load_constants)(IWineD3DDevice *iface, char usePS, char useVS); - void (*shader_cleanup)(BOOL usePS, BOOL useVS); + void (*shader_cleanup)(IWineD3DDevice *iface); } shader_backend_t; extern const shader_backend_t glsl_shader_backend;

1 0

Mikołaj Zalewski : shell32: Make sure BrowseForFolder doesn' t return NULL for the Desktop folder as this means a cancel.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: 474bf4fc4b222dbeee89133bb2f1c48b06ef050e URL: http://source.winehq.org/git/wine.git/?a=commit;h=474bf4fc4b222dbeee89133bb… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Feb 9 16:53:24 2007 +0100 shell32: Make sure BrowseForFolder doesn't return NULL for the Desktop folder as this means a cancel. --- dlls/shell32/brsfolder.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 666e34b..27c2097 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -524,7 +524,10 @@ static BOOL BrsFolder_OnCommand( browse_ switch (id) { case IDOK: - info->pidlRet = ILClone(info->pidlRet); /* The original pidl will be free'd. */ + /* The original pidl is owned by the treeview and will be free'd. */ + info->pidlRet = ILClone(info->pidlRet); + if (info->pidlRet == NULL) /* A null pidl would mean a cancel */ + info->pidlRet = _ILCreateDesktop(); pdump( info->pidlRet ); if (lpBrowseInfo->pszDisplayName) SHGetPathFromIDListW( info->pidlRet, lpBrowseInfo->pszDisplayName );

1 0

Mikołaj Zalewski : shell32: Add a confirmation dialog with a "Yes to All" option.
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: c55277c7e15f56d3c421c948e17338a1c22f560d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c55277c7e15f56d3c421c948e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Feb 9 16:59:43 2007 +0100 shell32: Add a confirmation dialog with a "Yes to All" option. --- dlls/shell32/shell32_En.rc | 13 ++++ dlls/shell32/shlfileop.c | 143 ++++++++++++++++++++++++++++++++++++++++---- dlls/shell32/shresdef.h | 5 ++ 3 files changed, 150 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 7c7caaa..09530c6 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -104,6 +104,19 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Message" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Yes to &all", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About %s" diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index ac38957..0a64531 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -65,6 +65,135 @@ static DWORD SHNotifyMoveFileW(LPCWSTR s static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists); static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly); +/* Confirm dialogs with an optional "Yes To All" as used in file operations confirmations + */ +static const WCHAR CONFIRM_MSG_PROP[] = {'W','I','N','E','_','C','O','N','F','I','R','M',0}; + +struct confirm_msg_info +{ + LPWSTR lpszText; + LPWSTR lpszCaption; + HICON hIcon; + BOOL bYesToAll; +}; + +/* as some buttons may be hidden and the dialog height may change we may need + * to move the controls */ +static void confirm_msg_move_button(HWND hDlg, INT iId, INT *xPos, INT yOffset, BOOL bShow) +{ + HWND hButton = GetDlgItem(hDlg, iId); + RECT r; + + if (bShow) { + POINT pt; + int width; + + GetWindowRect(hButton, &r); + width = r.right - r.left; + pt.x = r.left; + pt.y = r.top; + ScreenToClient(hDlg, &pt); + MoveWindow(hButton, *xPos - width, pt.y - yOffset, width, r.bottom - r.top, FALSE); + *xPos -= width + 5; + } + else + ShowWindow(hButton, SW_HIDE); +} + +/* Note: we paint the text manually and don't use the static control to make + * sure the text has the same height as the one computed in WM_INITDIALOG + */ +static INT_PTR CALLBACK ConfirmMsgBox_Paint(HWND hDlg) +{ + PAINTSTRUCT ps; + HFONT hOldFont; + RECT r; + HDC hdc; + + BeginPaint(hDlg, &ps); + hdc = ps.hdc; + + GetClientRect(GetDlgItem(hDlg, IDD_MESSAGE), &r); + /* this will remap the rect to dialog coords */ + MapWindowPoints(GetDlgItem(hDlg, IDD_MESSAGE), hDlg, (LPPOINT)&r, 2); + hOldFont = SelectObject(hdc, (HFONT)SendDlgItemMessageW(hDlg, IDD_MESSAGE, WM_GETFONT, 0, 0)); + DrawTextW(hdc, (LPWSTR)GetPropW(hDlg, CONFIRM_MSG_PROP), -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK); + SelectObject(hdc, hOldFont); + EndPaint(hDlg, &ps); + return TRUE; +} + +static INT_PTR CALLBACK ConfirmMsgBox_Init(HWND hDlg, LPARAM lParam) +{ + struct confirm_msg_info *info = (struct confirm_msg_info *)lParam; + INT xPos, yOffset; + int width, height; + HFONT hOldFont; + HDC hdc; + RECT r; + + SetWindowTextW(hDlg, info->lpszCaption); + ShowWindow(GetDlgItem(hDlg, IDD_MESSAGE), SW_HIDE); + SetPropW(hDlg, CONFIRM_MSG_PROP, (HANDLE)info->lpszText); + SendDlgItemMessageW(hDlg, IDD_ICON, STM_SETICON, (WPARAM)info->hIcon, 0); + + /* compute the text height and resize the dialog */ + GetClientRect(GetDlgItem(hDlg, IDD_MESSAGE), &r); + hdc = GetDC(hDlg); + yOffset = r.bottom; + hOldFont = SelectObject(hdc, (HFONT)SendDlgItemMessageW(hDlg, IDD_MESSAGE, WM_GETFONT, 0, 0)); + DrawTextW(hdc, info->lpszText, -1, &r, DT_NOPREFIX | DT_PATH_ELLIPSIS | DT_WORDBREAK | DT_CALCRECT); + SelectObject(hdc, hOldFont); + yOffset -= r.bottom; + yOffset = min(yOffset, 35); /* don't make the dialog too small */ + ReleaseDC(hDlg, hdc); + + GetClientRect(hDlg, &r); + xPos = r.right - 7; + GetWindowRect(hDlg, &r); + width = r.right - r.left; + height = r.bottom - r.top - yOffset; + MoveWindow(hDlg, (GetSystemMetrics(SM_CXSCREEN) - width)/2, + (GetSystemMetrics(SM_CYSCREEN) - height)/2, width, height, FALSE); + + confirm_msg_move_button(hDlg, IDCANCEL, &xPos, yOffset, info->bYesToAll); + confirm_msg_move_button(hDlg, IDNO, &xPos, yOffset, TRUE); + confirm_msg_move_button(hDlg, IDD_YESTOALL, &xPos, yOffset, info->bYesToAll); + confirm_msg_move_button(hDlg, IDYES, &xPos, yOffset, TRUE); + return TRUE; +} + +static INT_PTR CALLBACK ConfirmMsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + return ConfirmMsgBox_Init(hDlg, lParam); + case WM_PAINT: + return ConfirmMsgBox_Paint(hDlg); + case WM_COMMAND: + EndDialog(hDlg, wParam); + break; + case WM_CLOSE: + EndDialog(hDlg, IDCANCEL); + break; + } + return FALSE; +} + +static int SHELL_ConfirmMsgBox(HWND hWnd, LPWSTR lpszText, LPWSTR lpszCaption, HICON hIcon, BOOL bYesToAll) +{ + static const WCHAR wszTemplate[] = {'S','H','E','L','L','_','Y','E','S','T','O','A','L','L','_','M','S','G','B','O','X',0}; + struct confirm_msg_info info; + + info.lpszText = lpszText; + info.lpszCaption = lpszCaption; + info.hIcon = hIcon; + info.bYesToAll = bYesToAll; + return DialogBoxParamW(shell32_hInstance, wszTemplate, hWnd, ConfirmMsgBoxProc, (LPARAM)&info); +} + +/* confirmation dialogs content */ typedef struct { HINSTANCE hIconInstance; @@ -132,8 +261,8 @@ BOOL SHELL_ConfirmDialogW(HWND hWnd, int { WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; SHELL_ConfirmIDstruc ids; - MSGBOXPARAMSW params; DWORD_PTR args[1]; + HICON hIcon; if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; @@ -144,17 +273,9 @@ BOOL SHELL_ConfirmDialogW(HWND hWnd, int args[0] = (DWORD_PTR)szDir; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)args); + hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); - ZeroMemory(&params, sizeof(params)); - params.cbSize = sizeof(MSGBOXPARAMSW); - params.hwndOwner = hWnd; - params.hInstance = ids.hIconInstance; - params.lpszText = szBuffer; - params.lpszCaption = szCaption; - params.lpszIcon = (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id); - params.dwStyle = MB_YESNO | MB_USERICON; - - return (IDYES == MessageBoxIndirectW(&params)); + return (IDYES == SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, FALSE)); } static DWORD SHELL32_AnsiToUnicodeBuf(LPCSTR aPath, LPWSTR *wPath, DWORD minChars) diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 422acc4..b9a7bad 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -96,6 +96,11 @@ /* Note: this string is referenced from the registry*/ #define IDS_RECYCLEBIN_FOLDER_NAME 8964 +#define IDD_ICON 0x4300 +#define IDD_MESSAGE 0x4301 + +/* these IDs are the same as on native */ +#define IDD_YESTOALL 0x3207 /* browse for folder dialog box */ #define IDD_STATUS 0x3743 #define IDD_TITLE 0x3742

1 0

docs/en wineusr-introduction.sgml
by Dimi Paun 12 Feb '07

12 Feb '07

ChangeSet ID: 117124050078656053527175 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/02/11 16:35:00 Modified files: en : wineusr-introduction.sgml Log message: "Jeff L" <lats(a)yless4u.com.au> Add a Quick start to the Wine User Guide. Old revision New revision Changes Path 1.4 1.5 +44 -0 docs/en/wineusr-introduction.sgml Index: docs/en/wineusr-introduction.sgml diff -u -p docs/en/wineusr-introduction.sgml:1.4 docs/en/wineusr-introduction.sgml:1.5 --- docs/en/wineusr-introduction.sgml 12 Feb 2007 0:35: 0 -0000 +++ /dev/null 12 Feb 2007 0:35: 0 -0000 @@ -52,6 +52,50 @@ </para> </sect2> + <sect2> + <title>Quick start</title> + <para> + The process of installing and running wine can be summarised as + follows: + <itemizedlist> + <listitem> + <para> + Get a distribution as indicated in <link + linkend="getting-wine">Getting Wine</link> and see + the <ulink url="http://www.winehq.org/site/download">Wine + Downloads</> page. For the casual or new user the simplest + is to get an rpm distribution. + </para> + </listitem> + <listitem> + <para> + Configure wine using the <link + linkend="config-wine-main"><emphasis><filename>winecfg</></> + </link> command. For most people wine should now be usable. + </para> + </listitem> + <listitem> + <para> + To test your installation run wine's Windows 3.1 like file + manager using the <filename>wine winefile</> command. + </para> + </listitem> + <listitem> + <para> + Run wine using the <link + linkend="running"><emphasis><filename>wine</> + <filename>filespec/appname.exe</></></link> command. + </para> + <para> + The first command you will run will be to install a package. + Typically something like <filename>wine + /media/cdrom/setup.exe</> or the equivalent. + </para> + </listitem> + </itemizedlist> + </para> + </sect2> + </sect1> <sect1 id="what-is-wine">

1 0

lostwages/templates/en download-deb.template
by Jeremy Newman 09 Feb '07

09 Feb '07

ChangeSet ID: 30929 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/02/09 11:52:59 Modified files: templates/en : download-deb.template Log message: Scott Ritchie <scott(a)open-vote.org> Update the download-deb page with better information, notes for 64 bit users, clearer instructions. Patch: http://cvs.winehq.org/patch.py?id=30929 Old revision New revision Changes Path 1.13 1.14 +16 -4 lostwages/templates/en/download-deb.template Index: lostwages/templates/en/download-deb.template diff -u -p lostwages/templates/en/download-deb.template:1.13 lostwages/templates/en/download-deb.template:1.14 --- lostwages/templates/en/download-deb.template:1.13 9 Feb 2007 17:52:59 -0000 +++ lostwages/templates/en/download-deb.template 9 Feb 2007 17:52:59 -0000 @@ -34,15 +34,27 @@ list of trusted APT keys by copy and pas Then, you can install Wine from WineHQ like it were any other package, such as by using the Synaptic Package Manager under System->Administration. Alternatively, you -can install from the terminal by running 'apt-get update' to update APT's -package information and then 'apt-get install wine'. +can install from the terminal by running 'sudo apt-get update' to update APT's +package information and then 'sudo apt-get install wine'. + +<h2>64-bit Users:</h2> + +Note that, at this time, the entries above are for i386 users only. Attempting to +use these repositories with a different architecture (eg amd64), will result in 404 errors +as APT will be looking for files not in the repository. + +While there is currently no Wine package explicitly designed for the 64-bit version +of Ubuntu, there is an easy hack that can be used to install the 32-bit package +into the 64-bit distribution and have it function normally. See +<a href="http://wiki.winehq.org/UbuntuAMD64">this page on the Wine wiki</a> +for more details. <h2>Debian Users:</h2> If you are using Debian and want to make sure that apt-get will install the WineHQ Wine package instead of the Debian Wine package (which sometimes confuses -APT by having the same version number), then you will need to add something like -the following entry to /etc/apt/preferences: +APT by having the same version number), then after following the instructions above +you will also need to add something like the following entry to /etc/apt/preferences: Package: wine Pin: release l=WineHQ APT Repository

1 0

Francois Gouget : shell32/tests: Fix test_GetDisplayName() to cope with a left-over test directory.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: f97a2f9def0724d4810b7094859d16090aad5f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97a2f9def0724d4810b70948… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:41:08 2007 +0100 shell32/tests: Fix test_GetDisplayName() to cope with a left-over test directory. --- dlls/shell32/tests/shlfolder.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 714652f..389d18b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -338,6 +338,7 @@ static void test_GetDisplayName(void) HANDLE hTestFile; WCHAR wszTestFile[MAX_PATH], wszTestFile2[MAX_PATH], wszTestDir[MAX_PATH]; char szTestFile[MAX_PATH], szTestDir[MAX_PATH]; + DWORD attr; STRRET strret; LPSHELLFOLDER psfDesktop, psfPersonal; IUnknown *psfFile; @@ -364,10 +365,15 @@ static void test_GetDisplayName(void) PathAddBackslashW(wszTestDir); lstrcatW(wszTestDir, wszDirName); + /* Use ANSI file functions so this works on Windows 9x */ WideCharToMultiByte(CP_ACP, 0, wszTestDir, -1, szTestDir, MAX_PATH, 0, 0); - result = CreateDirectoryA(szTestDir, NULL); - ok(result, "CreateDirectoryA failed! Last error: %u\n", GetLastError()); - if (!result) return; + CreateDirectoryA(szTestDir, NULL); + attr=GetFileAttributesA(szTestDir); + if (attr == INVALID_FILE_ATTRIBUTES || !(attr & FILE_ATTRIBUTE_DIRECTORY)) + { + ok(0, "unable to create the '%s' directory\n", szTestDir); + return; + } lstrcpyW(wszTestFile, wszTestDir); PathAddBackslashW(wszTestFile);

1 0

Francois Gouget : shell32/tests: wnsprintfA() is missing on Win9x, so use sprintf() instead.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: abedd3df59ce26548ec05751110777a5f8d7325d URL: http://source.winehq.org/git/wine.git/?a=commit;h=abedd3df59ce26548ec057511… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:37:59 2007 +0100 shell32/tests: wnsprintfA() is missing on Win9x, so use sprintf() instead. --- dlls/shell32/tests/shellpath.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 3f89ff9..f793c2d 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -200,7 +200,7 @@ static void loadShell32(void) /* A couple utility printing functions */ static const char *getFolderName(int folder) { - static char unknown[17]; + static char unknown[32]; #define CSIDL_TO_STR(x) case x: return#x; switch (folder) @@ -265,7 +265,7 @@ static const char *getFolderName(int fol CSIDL_TO_STR(CSIDL_COMPUTERSNEARME); #undef CSIDL_TO_STR default: - wnsprintfA(unknown, sizeof(unknown), "unknown (0x%04x)", folder); + sprintf(unknown, "unknown (0x%04x)", folder); return unknown; } } @@ -276,8 +276,7 @@ static const char *printGUID(const GUID if (!guid) return NULL; - wnsprintfA(guidSTR, sizeof(guidSTR), - "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + sprintf(guidSTR, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); @@ -830,13 +829,12 @@ static void testNonExistentPath(void) if (!RegSetValueExA(key, "Favorites", 0, type, (LPBYTE)modifiedPath, len)) { - char buffer[MAX_PATH]; + char buffer[MAX_PATH+20]; STARTUPINFOA startup; PROCESS_INFORMATION info; HRESULT hr; - wnsprintfA(buffer, sizeof(buffer), "%s tests/shellpath.c 1", - selfname); + sprintf(buffer, "%s tests/shellpath.c 1", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -858,8 +856,7 @@ static void testNonExistentPath(void) strlen(originalPath) + 1); RegFlushKey(key); - wnsprintfA(buffer, sizeof(buffer), "%s tests/shellpath.c 2", - selfname); + sprintf(buffer, "%s tests/shellpath.c 2", selfname); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW;

1 0

Alexandre Julliard : Make.rules: Automatically generate the header for all types of idl sources.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: 1df72cc7949d85c90dc45989fa65806f36be96ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df72cc7949d85c90dc45989f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 9 14:32:36 2007 +0100 Make.rules: Automatically generate the header for all types of idl sources. --- Make.rules.in | 10 ++++++---- configure | 2 +- configure.ac | 4 ++-- dlls/oleaut32/tests/Makefile.in | 1 - tools/make_makefiles | 4 ++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index b254cdf..1b051ea 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -110,10 +110,12 @@ api_manext = 3w conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core -IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ - $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) +IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \ + $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) +IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=.h) \ + $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) -CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) \ +CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ $(MC_SRCS:.mc=.mc.rc) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) @@ -309,7 +311,7 @@ doc-sgml: $(DOCSUBDIRS:%=%/__doc_sgml__) $(MC_SRCS:.mc=.mc.rc): $(WMC) -$(IDL_H_SRCS:.idl=.h) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) +$(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) $(SUBDIRS): dummy @cd $@ && $(MAKE) diff --git a/configure b/configure index 0125b9e..0075cea 100755 --- a/configure +++ b/configure @@ -20387,7 +20387,7 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(ALL_OBJS): \$(IDL_H_SRCS:.idl=.h) +\$(ALL_OBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)" diff --git a/configure.ac b/configure.ac index 1f98f16..4edaa20 100644 --- a/configure.ac +++ b/configure.ac @@ -1476,7 +1476,7 @@ AC_SUBST(DEPENDENCIES,m4_if(m4_version_c Makefile: dummy\\ -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)\\ \\ -\$(ALL_OBJS): \$(IDL_H_SRCS:.idl=.h)\\ +\$(ALL_OBJS): \$(IDL_GEN_HEADERS)\\ \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)\\ \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\ \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"], @@ -1487,7 +1487,7 @@ Makefile: dummy\\ Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(ALL_OBJS): \$(IDL_H_SRCS:.idl=.h) +\$(ALL_OBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])) diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in index 3192610..7e0b307 100644 --- a/dlls/oleaut32/tests/Makefile.in +++ b/dlls/oleaut32/tests/Makefile.in @@ -20,7 +20,6 @@ CTESTS = \ RC_SRCS = tmarshal.rc IDL_I_SRCS = tmarshal.idl -IDL_H_SRCS = tmarshal.idl IDL_TLB_SRCS = tmarshal.idl @MAKE_TEST_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index ede3d9d..b21d4ef 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -92,6 +92,10 @@ my @ignore_srcs = ( [ 'RC_SRCS16', '\.rc', '.res' ], [ 'IDL_TLB_SRCS', '\.idl', '.tlb' ], [ 'IDL_H_SRCS', '\.idl', '.h' ], + [ 'IDL_C_SRCS', '\.idl', '.h' ], + [ 'IDL_I_SRCS', '\.idl', '.h' ], + [ 'IDL_P_SRCS', '\.idl', '.h' ], + [ 'IDL_S_SRCS', '\.idl', '.h' ], [ 'IDL_C_SRCS', '\.idl', '_c.c' ], [ 'IDL_I_SRCS', '\.idl', '_i.c' ], [ 'IDL_P_SRCS', '\.idl', '_p.c' ],

1 0

Francois Gouget : shell32/tests: ILFree() and ILIsEqual() are exported by ordinal only on Win9x. So use GetProcAddress().
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: 14712ece185a6c35f8706f9fc4956a509b7caad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14712ece185a6c35f8706f9fc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 9 12:38:11 2007 +0100 shell32/tests: ILFree() and ILIsEqual() are exported by ordinal only on Win9x. So use GetProcAddress(). --- dlls/shell32/tests/shlfolder.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 4606fff..714652f 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -46,6 +46,8 @@ static HRESULT (WINAPI *pSHBindToParent) static BOOL (WINAPI *pSHGetSpecialFolderPathW)(HWND, LPWSTR, int, BOOL); static HRESULT (WINAPI *pStrRetToBufW)(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); static LPITEMIDLIST (WINAPI *pILFindLastID)(LPCITEMIDLIST); +static void (WINAPI *pILFree)(LPITEMIDLIST); +static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static void init_function_pointers(void) { @@ -58,7 +60,8 @@ static void init_function_pointers(void) pSHBindToParent = (void*)GetProcAddress(hmod, "SHBindToParent"); pSHGetSpecialFolderPathW = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathW"); pILFindLastID = (void *)GetProcAddress(hmod, (LPCSTR)16); - + pILFree = (void*)GetProcAddress(hmod, (LPSTR)155); + pILIsEqual = (void*)GetProcAddress(hmod, (LPSTR)21); } hmod = GetModuleHandleA("shlwapi.dll"); @@ -429,10 +432,10 @@ static void test_GetDisplayName(void) hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr); - ILFree(pidlNew); + pILFree(pidlNew); IShellFolder_Release(psfPersonal); } - + /* Deleting the file and the directory */ DeleteFileA(szTestFile); RemoveDirectoryA(szTestDir); @@ -1122,17 +1125,17 @@ static void test_FolderShortcut(void) { ok (SUCCEEDED(hr), "IPersistFolder3::Initialize failed! hr = %08x\n", hr); if (FAILED(hr)) { IPersistFolder3_Release(pPersistFolder3); - ILFree(pidlWineTestFolder); + pILFree(pidlWineTestFolder); return; } - + hr = IPersistFolder3_GetCurFolder(pPersistFolder3, &pidlCurrentFolder); ok(SUCCEEDED(hr), "IPersistFolder3_GetCurFolder failed! hr=0x%08x\n", hr); - ok(ILIsEqual(pidlCurrentFolder, pidlWineTestFolder), + ok(pILIsEqual(pidlCurrentFolder, pidlWineTestFolder), "IPersistFolder3_GetCurFolder should return pidlWineTestFolder!\n"); - ILFree(pidlCurrentFolder); - ILFree(pidlWineTestFolder); - + pILFree(pidlCurrentFolder); + pILFree(pidlWineTestFolder); + hr = IPersistFolder3_QueryInterface(pPersistFolder3, &IID_IShellFolder, (LPVOID*)&pShellFolder); IPersistFolder3_Release(pPersistFolder3); ok(SUCCEEDED(hr), "IPersistFolder3_QueryInterface(IShellFolder) failed! hr = %08x\n", hr); @@ -1166,12 +1169,12 @@ static void test_FolderShortcut(void) { return; } - hr = IShellFolder_BindToObject(pShellFolder, pidlSubFolder, NULL, &IID_IPersistFolder3, + hr = IShellFolder_BindToObject(pShellFolder, pidlSubFolder, NULL, &IID_IPersistFolder3, (LPVOID*)&pPersistFolder3); IShellFolder_Release(pShellFolder); - ILFree(pidlSubFolder); + pILFree(pidlSubFolder); ok (SUCCEEDED(hr), "IShellFolder::BindToObject failed! hr = %08x\n", hr); - if (FAILED(hr)) + if (FAILED(hr)) return; /* On windows, we expect CLSID_ShellFSFolder. On wine we relax this constraint @@ -1242,10 +1245,10 @@ static void test_ITEMIDLIST_format(void) return; } - hr = IShellFolder_BindToObject(psfDesktop, pidlPersonal, NULL, &IID_IShellFolder, + hr = IShellFolder_BindToObject(psfDesktop, pidlPersonal, NULL, &IID_IShellFolder, (LPVOID*)&psfPersonal); IShellFolder_Release(psfDesktop); - ILFree(pidlPersonal); + pILFree(pidlPersonal); ok(SUCCEEDED(hr), "psfDesktop->BindToObject failed! hr = %08x\n", hr); if (FAILED(hr)) return; @@ -1329,7 +1332,7 @@ static void test_ITEMIDLIST_format(void) } } - ILFree(pidlFile); + pILFree(pidlFile); } }

1 0