wine-devel January 2005

wine-devel@winehq.org

149 participants
343 discussions

Updating my address book
by Dustin 22 Jan '05

22 Jan '05

Hi I am updating my address book and it would be very helpful if you could click on the link below and enter your contact details for me: http://www.bebo.com/fr2/979448a934523b19214292c927616713d18 I am using a service that keeps contact details current, just update your own contact details and then the changes appear in selected friends address books. When I update my contact details you will see them in your address book. Thank you for helping. Dustin

1 0

cleanup shlfileop.c
by Joris Huizer 22 Jan '05

22 Jan '05

Changelog: - use retCode smarter (undoing a few bits of myself) - add file_operation_invalid_handle(), file_operation_on_data(), file_operation_invalid_attr() instead of inline code I put back the line the discussion was about - I thought about it and I probably was not thinking the right way; If there are still problems, please let me know Sending here now as it wasn't applied: is there a problem with it or should I just re-submit ? regards, Joris ? .shlfile.diff.swp ? description-pak ? doc-pak ? shlfile.diff ? thisref.sh ? versions ? wine-current.deb ? wine-working.deb ? dlls/shell32/shlfileop.jh.0.c ? dlls/shell32/shlfileop.jh.c Index: dlls/shell32/shlfileop.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/shlfileop.c,v retrieving revision 1.51 diff -u -p -r1.51 shlfileop.c --- dlls/shell32/shlfileop.c 14 Jan 2005 16:51:14 -0000 1.51 +++ dlls/shell32/shlfileop.c 22 Jan 2005 11:37:59 -0000 @@ -945,6 +945,65 @@ static int file_operation_checkFlags(SHF return 0; } +static int file_operation_invalid_handle(long FuncSwitch, LPWSTR pFromFile, DWORD ToPathAttr, LPWSTR pTempFrom) +{ + BOOL b_Mask = (NULL != StrPBrkW(&pFromFile[1], wWildcardChars)); + if ((FO_DELETE == FuncSwitch) && (b_Mask)) + { + DWORD FromPathAttr; + pFromFile[0] = '\0'; + FromPathAttr = GetFileAttributesW(pTempFrom); + pFromFile[0] = '\\'; + if (IsAttribDir(FromPathAttr)) + { + /* FO_DELETE with mask and without found is valid */ + return 0; + } + } + /* root (without mask) is also not allowed as source, tested in W98 */ + return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; +} + +static int file_operation_on_data(WIN32_FIND_DATAW *wfd,SHFILEOPSTRUCTW *nFileOp, LPWSTR pFromFile,LPWSTR pToFile) +{ + LPWSTR lpFileName = wfd->cAlternateFileName; + if (!lpFileName[0]) + lpFileName = wfd->cFileName; + if (IsDotDir(lpFileName) || + (IsAttribDir(wfd->dwFileAttributes) && (nFileOp->fFlags & FOF_FILESONLY))) + return 0; /* next name in pTempFrom(dir) */ + SHFileStrCpyCatW(&pToFile[1], lpFileName, NULL); + SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); + return SHFileOperationW (nFileOp); +} + +static int file_operation_invalid_attr(LPWSTR pToFile,LPWSTR pTempTo, BOOL b_ToValid) +{ + DWORD ToPathAttr; + BOOL b_ToInvalidTail; + if (pToFile) + { + b_ToInvalidTail = (NULL != StrPBrkW(&pToFile[1], wWildcardChars)); + pToFile[0] = '\0'; + ToPathAttr = GetFileAttributesW(pTempTo); + if ((ToPathAttr == INVALID_FILE_ATTRIBUTES) && b_ToValid) + { + /* create dir must be here, sample target D:\y\ *.* create with RC=10003 */ + if (SHNotifyCreateDirectoryW(pTempTo, NULL)) + { + return 0x73;/* value unknown */ + } + ToPathAttr = GetFileAttributesW(pTempTo); + } + pToFile[0] = '\\'; + if (b_ToInvalidTail) + { + return 0x10003; + } + } + return 0; +} + /************************************************************************* * SHFileOperationW [SHELL32.@] * @@ -964,7 +1023,6 @@ int WINAPI SHFileOperationW(LPSHFILEOPST LPWSTR pTempTo = NULL; LPWSTR pFromFile; LPWSTR pToFile = NULL; - LPWSTR lpFileName; int retCode = 0; DWORD ToAttr; DWORD ToPathAttr; @@ -986,8 +1044,6 @@ int WINAPI SHFileOperationW(LPSHFILEOPST long FuncSwitch = (nFileOp.wFunc & FO_MASK); long level= nFileOp.wFunc>>4; - int ret; - /* default no error */ nFileOp.fAnyOperationsAborted = FALSE; @@ -1016,10 +1072,9 @@ int WINAPI SHFileOperationW(LPSHFILEOPST * create dir 0 0 0 0 0 0 1 0 */ - ret = file_operation_checkFlags(nFileOp); - if (ret != 0) + retCode = file_operation_checkFlags(nFileOp); + if (retCode) { - retCode = ret; goto shfileop_end; } @@ -1108,20 +1163,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPST hFind = FindFirstFileW(pFrom, &wfd); if (INVALID_HANDLE_VALUE == hFind) { - if ((FO_DELETE == FuncSwitch) && (b_Mask)) - { - DWORD FromPathAttr; - pFromFile[0] = '\0'; - FromPathAttr = GetFileAttributesW(pTempFrom); - pFromFile[0] = '\\'; - if (IsAttribDir(FromPathAttr)) - { - /* FO_DELETE with mask and without found is valid */ - goto shfileop_end; - } - } - /* root (without mask) is also not allowed as source, tested in W98 */ - retCode = ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; + retCode = file_operation_invalid_handle(FuncSwitch,pFromFile,ToPathAttr,pTempFrom); goto shfileop_end; } @@ -1130,13 +1172,8 @@ int WINAPI SHFileOperationW(LPSHFILEOPST /* ??? b_Mask = (!SHFileStrICmpA(&pFromFile[1], &wfd.cFileName[0], HIGH_ADR, HIGH_ADR)); */ if (!pTo) /* FO_DELETE */ { - ret = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind); - /* if ret is not 0, nFileOp.fAnyOperationsAborted is TRUE */ - if (ret != 0) - { - retCode = ret; - goto shfileop_end; - } + retCode = file_operation_delete(&wfd,nFileOp,pFromFile,pTempFrom,&hFind); + /* if retCode is not 0, nFileOp.fAnyOperationsAborted is TRUE and while loop will end */ continue; } /* FO_DELETE ends, pTo must be always valid from here */ @@ -1202,15 +1239,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPST nFileOp.fFlags = (nFileOp.fFlags | FOF_MULTIDESTFILES); do { - lpFileName = wfd.cAlternateFileName; - if (!lpFileName[0]) - lpFileName = wfd.cFileName; - if (IsDotDir(lpFileName) || - (IsAttribDir(wfd.dwFileAttributes) && (nFileOp.fFlags & FOF_FILESONLY))) - continue; /* next name in pTempFrom(dir) */ - SHFileStrCpyCatW(&pToFile[1], lpFileName, NULL); - SHFileStrCpyCatW(&pFromFile[1], lpFileName, NULL); - retCode = SHFileOperationW (&nFileOp); + retCode = file_operation_on_data(&wfd,&nFileOp,pFromFile,pToFile); } while(!nFileOp.fAnyOperationsAborted && FindNextFileW(hFind, &wfd)); } FindClose(hFind); @@ -1222,27 +1251,9 @@ int WINAPI SHFileOperationW(LPSHFILEOPST /* only FO_COPY/FO_MOVE without mask, all others are (must be) solved */ if (IsAttribDir(wfd.dwFileAttributes) && (ToAttr == INVALID_FILE_ATTRIBUTES)) { - if (pToFile) - { - pToFile[0] = '\0'; - ToPathAttr = GetFileAttributesW(pTempTo); - if ((ToPathAttr == INVALID_FILE_ATTRIBUTES) && b_ToValid) - { - /* create dir must be here, sample target D:\y\ *.* create with RC=10003 */ - if (SHNotifyCreateDirectoryW(pTempTo, NULL)) - { - retCode = 0x73;/* value unknown */ - goto shfileop_end; - } - ToPathAttr = GetFileAttributesW(pTempTo); - } - pToFile[0] = '\\'; - if (b_ToInvalidTail) - { - retCode = 0x10003; - goto shfileop_end; - } - } + retCode = file_operation_invalid_attr(pToFile,pTempTo,b_ToValid); + if (retCode) + goto shfileop_end; } /* trailing BackSlash is ever removed and pToFile points to BackSlash before */

1 0

Re: janitorial: COM status update
by Tom 22 Jan '05

22 Jan '05

James Hawkins wrote: > Hi, > > Changelog > * update the status of the COM janitorial projects > > -- > James Hawkins > > Index: templates/en/janitorial.template > =================================================================== > RCS file: /home/wine/lostwages/templates/en/janitorial.template,v > retrieving revision 1.64 > diff -u -r1.64 janitorial.template > --- templates/en/janitorial.template 19 Jan 2005 16:54:31 -0000 1.64 > +++ templates/en/janitorial.template 21 Jan 2005 23:04:11 -0000 > @@ -70,28 +70,10 @@ > <li>avifil32 : 7 files to check > <li>d3d8 : 12 files to check > <li>d3d9 : 17 files to check > - <li>d3dx8 : 1 files to check > - <li>d3dxof : 1 files to check > - <li>dmband : 3 files to check > - <li class=submitted>dmcompos : 4 files checked I beleive this is the way it should be done (class=submitted) instead of removing completed entries. Tom

2 2

spam
by Tom 21 Jan '05

21 Jan '05

Unofficial guide for running eXeem under Linux! http://exeem-linux.solaris.name/index.php And Wine is used ofcourse. Tom

1 0

Oracle - unixODBC - wine - Win32 ODBC Apple
by Martin HEIN 21 Jan '05

21 Jan '05

Hi folks, I'm trying to connect some of our proprietory corporate Windows-based applictions via ODBC to our Oracle database by following as stated in the Wine User's Guide, Using ODBC, but it's to no avail! :( I have setup * Oracle 10g Instant Client for Linux 10.1.0.3 (/usr/local/oracle/10.1.0.3) * unixODBC 2.2.10 (/usr/local) * Oracle ODBC driver 0.5.4 (/usr) * CodeWeavers CrossOver Office 4.1 (/appl/os/CrossOver/cxoffice) My environment looks like * ORACLE_BASE=/usr/local/oracle * ORACLE_VER=10.1.0.3 * ORACLE_HOME=$ORACLE_BASE/$ORACLE_VER * TNS_ADMIN=$ORACLE_HOME/etc * LIB_ODBC_DRIVER_MANAGER=/usr/local/lib/libodbc.so My configuration files are located under * tnsnames.ora: $ORACLE_HOME/etc * odbcinst.ini: /usr/local/etc * odbc.ini: /usr/local/etc Using 'sqlplus' (Oracle; SQL*Net) or 'isql' (unixODBC; ODBC) to connect from the Unix command line to one of the configured databases works perfectly fine! But unfortunately I can't get unixODBC and wine working together! :( Cheers, Martin -------------------------------------------------- T-Mobile Austria GmbH Ing.Martin HEIN Information Technologies / Services Knowledge Management & Process Automation / Senior Manager Rennweg 97-99 A-1030 Vienna Fon: +43-1-79585-6337 Fax: +43-1-79585-6584 Mobile: +43-676-82006337 E-Mail: Martin.HEIN(a)T-Mobile.at Web: http://www.T-Mobile.at -------------------------------------------------- NOTICE AND DISCLAIMER: This email (including attachments) is confidential. If you have received this email in error please notify the sender immediately and delete this email from your system without copying or disseminating it or placing any reliance upon its contents. --------------------------------------------------

3 2

How to create an ODBC DSN
by Martin HEIN 21 Jan '05

21 Jan '05

Hi folks, How can I use my working unixODBC DSN under wine, or how can I create a working Windows-based ODBC DSN using an underlying unixODBC DSN? Cheers, Martin -------------------------------------------------- T-Mobile Austria GmbH Ing.Martin HEIN Information Technologies / Services Knowledge Management & Process Automation / Senior Manager Rennweg 97-99 A-1030 Vienna Fon: +43-1-79585-6337 Fax: +43-1-79585-6584 Mobile: +43-676-82006337 E-Mail: Martin.HEIN(a)T-Mobile.at Web: http://www.T-Mobile.at -------------------------------------------------- NOTICE AND DISCLAIMER: This email (including attachments) is confidential. If you have received this email in error please notify the sender immediately and delete this email from your system without copying or disseminating it or placing any reliance upon its contents. --------------------------------------------------

2 1

Re: Problems starting regedit without a .wine directory
by Michael Jung 21 Jan '05

21 Jan '05

On Friday 21 January 2005 18:32, you wrote: > We don't call any activation context functions in Wine, which suggests > that you are using some native dlls. Could you run with +loaddll? ... trace:loaddll:load_dll Loaded module L"Z:\\home\\mjung\\comctl32.dll" : native ... I had a comctl32.dll laying around in my home directory, which wine happily picked up. I wrongly assumed that there would be no possibility for wine to pick up a native dll if there is no .wine directory. Thanks for your tip! Ciao, Michael

1 0

we just hit the 1 MB mark!!
by Tom 21 Jan '05

21 Jan '05

Hello, Looks as if we just hit the 1 MB mark in wine-cvs commits for the first time. :-) Tom

2 1

Problems starting regedit without a .wine directory
by Michael Jung 21 Jan '05

21 Jan '05

Hi, if I start regedit on the current cvs version of wine without having a .wine directory in the users home directory I get the following console output: mjung@denkbrett:~$ rm -rf .wine mjung@denkbrett:~$ regedit wine: creating configuration directory '/home/mjung/.wine'... fixme:advapi:CheckTokenMembership (0x58 0x77c81810 0x77a3d474) stub! fixme:actctx:QueryActCtxW stub! disabling TCL support disabling TCL support fixme:advapi:CheckTokenMembership (0x54 0x77c8e1c0 0x77a3d3ec) stub! fixme:actctx:QueryActCtxW stub! wine: '/home/mjung/.wine' created successfully. fixme:advapi:CheckTokenMembership (0x54 0x77c4c148 0x77a1f8e4) stub! fixme:actctx:QueryActCtxW stub! err:win:CreateWindowExA bad class name "SysTreeView32" err:win:CreateWindowExA bad class name "SysListView32" err:win:CreateWindowExA bad class name "msctls_statusbar32" The regedit window is displayed, but the treeview- and listview-panes as well as the statusbar are not displayed (which seems reasonable given the last three log message). Did anybody else make these observations? Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

2 1

Help debugging Fotowire
by Antti Mäkelä 21 Jan '05

21 Jan '05

Hi, I'm trying to get a (Win or Mac) software from my local photo printing shop to work. The software is in Finnish, and downloadable from http://www.ifi.fi/programs/IFI_OnlineFoto.exe. From what I gather, the software is just licensed and translated version of Fotowire, found at http://www.fotowire.com/home/html/download.htm Anyway, I cannot get it to work. With 20041201 it crashed at the end of install process (still found it's way to the virtual drive though). This was fixed in 20050111. The problem with actual functionality, however, was not. The program starts with a wizard. The first dialog box says that the software wants to connect to Internet. When I click next, there is an quick "connecting to server - respond received" dialog box and then an error box with a message that says "erroneous response received - check your connection" and the program returns to the first screen. With 20041201 I got some errors about CalendarA's as quarter-stub, but these have disappeared with 20051101. How do I go on with debugging this problem? I tried setting WINEDEBUG=+all wine fwprint.exe, but no debug messages appear..I'm using Gentoo, kernel 2.6.10, gcc 3.4. Thanks for any and all assistance. Hopefully we can get this to work. I do have access to native DLLs from Win'98 or 2k if any of those can help. -- - Antti Mäkelä - http://www.cs.tut.fi/~zarhan - zarhan(a)cs.tut.fi - There is a theory which states that if ever anyone discovers exactly what the Universe is for and why it is here,it will instantly disappear and be replaced by something even more bizarre and inexplicable.

6 15

← Newer
1
...
10
11
12
13
14
15
16
...
35
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-devel January 2005