Changeset 7904 for trunk/src/shell32
- Timestamp:
- Feb 14, 2002, 1:10:12 PM (24 years ago)
- Location:
- trunk/src/shell32
- Files:
-
- 2 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/shell32/brsfolder.c
r7009 r7904 1 /* $Id: brsfolder.c,v 1. 6 2001-10-10 22:56:08 phallerExp $ */1 /* $Id: brsfolder.c,v 1.7 2002-02-14 12:10:07 sandervl Exp $ */ 2 2 3 3 /* … … 338 338 * 339 339 */ 340 ODINFUNCTION1(LPITEMIDLIST, SHBrowseForFolderA, 341 LPBROWSEINFOA, lpbi) 340 LPITEMIDLIST WIN32API SHBrowseForFolderA(LPBROWSEINFOA lpbi) 342 341 { 343 342 TRACE("(%p{lpszTitle=%s,owner=%i})\n", -
trunk/src/shell32/makefile
r7397 r7904 1 # $Id: makefile,v 1.3 7 2001-11-19 12:34:04sandervl Exp $1 # $Id: makefile,v 1.38 2002-02-14 12:10:08 sandervl Exp $ 2 2 3 3 # … … 11 11 # Compiler, tools, and interference rules. 12 12 # 13 !if "$(DEBUG)" == "1" 14 DEFFILE = shell32dbg.def 15 ORGDEFFILE = shell32.def 16 !endif 17 13 18 WRC_PREFIX_RESOURCE=1 14 19 !include ../../makefile.inc … … 61 66 $(OBJDIR)\shpolicy.obj \ 62 67 $(OBJDIR)\systray.obj \ 68 !if "$(DEBUG)" == "1" 69 $(OBJDIR)\dbgwrap.obj \ 70 !endif 63 71 $(OBJDIR)\shres.obj 64 72 -
trunk/src/shell32/misc.cpp
r5472 r7904 1 /* $Id: misc.cpp,v 1.1 1 2001-04-04 09:02:15sandervl Exp $ */1 /* $Id: misc.cpp,v 1.12 2002-02-14 12:10:08 sandervl Exp $ */ 2 2 3 3 /* … … 76 76 *****************************************************************************/ 77 77 78 ODINFUNCTION3(HICON, ExtractAssociatedIconExA, 79 HINSTANCE, hInst, 80 LPSTR, lpIconPath, 81 LPWORD, lpiIcon) 78 HICON WIN32API ExtractAssociatedIconExA(HINSTANCE hInst, LPSTR lpIconPath, 79 LPWORD lpiIcon) 82 80 { 83 81 dprintf(("SHELL32: undoc ExtractAssociatedIconExA\n")); … … 99 97 *****************************************************************************/ 100 98 101 ODINFUNCTION3(HICON, ExtractAssociatedIconW, 102 HINSTANCE, hInst, 103 LPWSTR, lpIconPath, 104 LPWORD, lpiIcon) 99 HICON WIN32API ExtractAssociatedIconW(HINSTANCE hInst, LPWSTR lpIconPath, 100 LPWORD lpiIcon) 105 101 { 106 102 LPSTR lpIconPathAscii = UnicodeToAsciiString(lpIconPath); … … 129 125 *****************************************************************************/ 130 126 131 ODINFUNCTION3(HICON, ExtractAssociatedIconExW, 132 HINSTANCE, hInst, 133 LPWSTR, lpIconPath, 134 LPWORD, lpiIcon) 127 HICON WIN32API ExtractAssociatedIconExW(HINSTANCE hInst, LPWSTR lpIconPath, 128 LPWORD lpiIcon) 135 129 { 136 130 dprintf(("SHELL32: undoc ExtractAssociatedIconExW\n")); … … 152 146 *****************************************************************************/ 153 147 154 ODINFUNCTION4(BOOL, OleStrToStrN, 155 LPSTR, lpMulti, 156 INT, nMulti, 157 LPCWSTR, lpWide, 158 INT, nWide) 148 BOOL WIN32API OleStrToStrN(LPSTR lpMulti, INT nMulti, LPCWSTR lpWide, 149 INT nWide) 159 150 { 160 151 return WideCharToMultiByte (0, … … 181 172 *****************************************************************************/ 182 173 183 ODINFUNCTION4(BOOL, StrToOleStrN, 184 LPWSTR, lpWide, 185 INT, nWide, 186 LPCSTR, lpMulti, 187 INT, nMulti) 174 BOOL WIN32API StrToOleStrN(LPWSTR lpWide, INT nWide, LPCSTR lpMulti, 175 INT nMulti) 188 176 { 189 177 return MultiByteToWideChar (0, … … 208 196 *****************************************************************************/ 209 197 210 ODINFUNCTION2(HRESULT, SHELL32_654, 211 DWORD, x, 212 DWORD, y) 198 HRESULT WIN32API SHELL32_654(DWORD x, DWORD y) 213 199 { 214 200 dprintf(("SHELL32: SHELL32_654(%08xh,%08xh) not implemented.\n", … … 231 217 *****************************************************************************/ 232 218 233 ODINFUNCTION2(int, StrToOleStr, 234 LPWSTR, lpWideCharStr, 235 LPCSTR, lpMultiByteString) 219 int WIN32API StrToOleStr(LPWSTR lpWideCharStr, LPCSTR lpMultiByteString) 236 220 { 237 221 return MultiByteToWideChar(0, … … 255 239 *****************************************************************************/ 256 240 257 ODINFUNCTION1(DWORD, InternalExtractIconListA, DWORD,dwArg1)241 DWORD WIN32API InternalExtractIconListA(DWORD dwArg1) 258 242 { 259 243 dprintf(("SHELL32: undoc InternalExtractIconListA \n")); … … 273 257 *****************************************************************************/ 274 258 275 ODINFUNCTION1(DWORD, InternalExtractIconListW, DWORD,dwArg1)259 DWORD WIN32API InternalExtractIconListW(DWORD dwArg1) 276 260 { 277 261 dprintf(("SHELL32: undoc InternalExtractIconListW\n")); … … 291 275 *****************************************************************************/ 292 276 293 ODINFUNCTION1(DWORD, ExtractIconResInfoA, DWORD,dwArg1)277 DWORD WIN32API ExtractIconResInfoA(DWORD dwArg1) 294 278 { 295 279 dprintf(("SHELL32: undoc ExtractIconResInfoA\n")); … … 309 293 *****************************************************************************/ 310 294 311 ODINFUNCTION1(DWORD, ExtractIconResInfoW, DWORD,dwArg1)295 DWORD WIN32API ExtractIconResInfoW( DWORD dwArg1) 312 296 { 313 297 dprintf(("SHELL32: undoc ExtractIconResInfoW\n")); … … 327 311 *****************************************************************************/ 328 312 329 ODINPROCEDURE2(CheckEscapesA, 330 DWORD, x1, 331 DWORD, x2) 313 void WIN32API CheckEscapesA(DWORD x1, DWORD x2) 332 314 { 333 315 dprintf(("SHELL32: undoc CheckEscapesA\n")); … … 346 328 *****************************************************************************/ 347 329 348 ODINPROCEDURE2(CheckEscapesW, 349 DWORD, x1, 350 DWORD, x2) 330 void WIN32API CheckEscapesW(DWORD x1, DWORD x2) 351 331 { 352 332 dprintf(("SHELL32: undoc CheckEscapesW\n")); … … 365 345 *****************************************************************************/ 366 346 367 ODINFUNCTION1(DWORD, DuplicateIcon, 368 DWORD, x1) 347 DWORD WIN32API DuplicateIcon(DWORD x1) 369 348 { 370 349 dprintf(("SHELL32: undoc DuplicateIcon\n")); -
trunk/src/shell32/pidl.c
r7502 r7904 166 166 */ 167 167 168 ODINFUNCTION2(BOOL, ILGetDisplayName, 169 LPCITEMIDLIST, pidl, 170 LPSTR, path) 168 BOOL WIN32API ILGetDisplayName(LPCITEMIDLIST pidl, LPSTR path) 171 169 { 172 170 TRACE_(shell)("pidl=%p %p semi-stub\n",pidl,path); … … 179 177 * observed: pidl=Desktop return=pidl 180 178 */ 181 ODINFUNCTION1(LPITEMIDLIST, ILFindLastID, 182 LPITEMIDLIST, pidl) 179 LPITEMIDLIST WIN32API ILFindLastID(LPITEMIDLIST pidl) 183 180 { LPITEMIDLIST pidlLast = pidl; 184 181 … … 198 195 * when pidl=Desktop return=FALSE 199 196 */ 200 ODINFUNCTION1(BOOL, ILRemoveLastID, 201 LPCITEMIDLIST, pidl) 197 BOOL WIN32API ILRemoveLastID(LPCITEMIDLIST pidl) 202 198 { 203 199 TRACE_(shell)("pidl=%p\n",pidl); … … 215 211 * dupicate an idlist 216 212 */ 217 ODINFUNCTION1(LPITEMIDLIST, ILClone, 218 LPCITEMIDLIST, pidl) 213 LPITEMIDLIST WIN32API ILClone(LPCITEMIDLIST pidl) 219 214 { DWORD len; 220 215 LPITEMIDLIST newpidl; … … 239 234 * duplicates the first idlist of a complex pidl 240 235 */ 241 ODINFUNCTION1(LPITEMIDLIST, ILCloneFirst, 242 LPCITEMIDLIST, pidl) 236 LPITEMIDLIST WIN32API ILCloneFirst(LPCITEMIDLIST pidl) 243 237 { DWORD len; 244 238 LPITEMIDLIST pidlNew = NULL; … … 270 264 * the first two bytes are the len, the pidl is following then 271 265 */ 272 ODINFUNCTION2(HRESULT, ILLoadFromStream, 273 IStream *, pStream, 274 LPITEMIDLIST *, ppPidl) 266 HRESULT WIN32API ILLoadFromStream(IStream *pStream, LPITEMIDLIST *ppPidl) 275 267 { WORD wLen = 0; 276 268 DWORD dwBytesRead; … … 316 308 * the first two bytes are the len, the pidl is following then 317 309 */ 318 ODINFUNCTION2(HRESULT, ILSaveToStream, 319 IStream *, pStream, 320 LPCITEMIDLIST, pPidl) 310 HRESULT WIN32API ILSaveToStream(IStream * pStream, LPCITEMIDLIST pPidl) 321 311 { 322 312 LPITEMIDLIST pidl; … … 354 344 * wraper for IShellFolder::ParseDisplayName() 355 345 */ 356 ODINFUNCTION3(HRESULT, SHILCreateFromPathA, 357 LPCSTR, path, 358 LPITEMIDLIST *, ppidl, 359 DWORD *, attributes) 346 HRESULT WIN32API SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST *ppidl, 347 DWORD *attributes) 360 348 { LPSHELLFOLDER sf; 361 349 WCHAR lpszDisplayName[MAX_PATH]; … … 377 365 378 366 379 ODINFUNCTION3(HRESULT, SHILCreateFromPathW, 380 LPCWSTR, path, 381 LPITEMIDLIST *, ppidl, 382 DWORD *, attributes) 367 HRESULT WIN32API SHILCreateFromPathW(LPCWSTR path, 368 LPITEMIDLIST * ppidl, 369 DWORD * attributes) 383 370 { LPSHELLFOLDER sf; 384 371 DWORD pchEaten; … … 413 400 * exported by ordinal 414 401 */ 415 ODINFUNCTION3(LPITEMIDLIST, SHCloneSpecialIDList, 416 HWND, hwndOwner, 417 DWORD, nFolder, 418 DWORD, x3) 402 LPITEMIDLIST WIN32API SHCloneSpecialIDList(HWND hwndOwner, 403 DWORD nFolder, 404 DWORD x3) 419 405 { LPITEMIDLIST ppidl; 420 406 WARN_(shell)("(hwnd=0x%x,csidl=0x%lx,0x%lx):semi-stub.\n", … … 430 416 * 431 417 */ 432 ODINFUNCTION1(LPITEMIDLIST, ILGlobalClone, 433 LPCITEMIDLIST ,pidl)418 LPITEMIDLIST WIN32API ILGlobalClone( 419 LPCITEMIDLIST pidl) 434 420 { DWORD len; 435 421 LPITEMIDLIST newpidl; … … 453 439 * 454 440 */ 455 ODINFUNCTION2(BOOL, ILIsEqual, 456 LPCITEMIDLIST, pidl1, 457 LPCITEMIDLIST, pidl2) 441 BOOL WIN32API ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) 458 442 { 459 443 // char szData1[MAX_PATH]; … … 505 489 * child=a/b/c/d -> true if bImmediate is false, d is in a subfolder of a/b 506 490 */ 507 ODINFUNCTION3(BOOL, ILIsParent, 508 LPCITEMIDLIST, pidlParent, 509 LPCITEMIDLIST, pidlChild, 510 BOOL, bImmediate) 491 BOOL WIN32API ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, 492 BOOL bImmediate) 511 493 { 512 494 char szData1[MAX_PATH]; … … 552 534 * pidl2 equal pidl1 pointer to last 0x00-element of pidl2 553 535 */ 554 ODINFUNCTION2(LPITEMIDLIST, ILFindChild, 555 LPCITEMIDLIST, pidl1, 556 LPCITEMIDLIST, pidl2) 536 LPITEMIDLIST ILFindChild(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) 557 537 { 558 538 char szData1[MAX_PATH]; … … 610 590 * Does not destroy the passed in idlists! 611 591 */ 612 ODINFUNCTION2(LPITEMIDLIST, ILCombine, 613 LPCITEMIDLIST, pidl1, 614 LPCITEMIDLIST, pidl2) 592 LPITEMIDLIST WIN32API ILCombine(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) 615 593 { 616 594 DWORD len1,len2; … … 653 631 * NOTES 654 632 */ 655 ODINFUNCTION3(LPITEMIDLIST, SHGetRealIDL, 656 LPSHELLFOLDER, lpsf, 657 LPITEMIDLIST, pidl, 658 DWORD, z) 633 LPITEMIDLIST WIN32API SHGetRealIDL(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl, 634 DWORD z) 659 635 { 660 636 dprintf(("not yet implemented")); … … 673 649 * pild = CSIDL_DRIVES ret = 0 674 650 */ 675 ODINFUNCTION1(LPITEMIDLIST, SHLogILFromFSIL, 676 LPITEMIDLIST, pidl) 651 LPITEMIDLIST WIN32API SHLogILFromFSIL(LPITEMIDLIST pidl) 677 652 { 678 653 dprintf(("not yet implemented")); … … 698 673 * exported by ordinal 699 674 */ 700 ODINFUNCTION1(DWORD, ILGetSize, 701 LPITEMIDLIST, pidl) 675 DWORD WIN32API ILGetSize(LPITEMIDLIST pidl) 702 676 { 703 677 LPSHITEMID si = &(pidl->mkid); … … 728 702 * 729 703 */ 730 ODINFUNCTION1(LPITEMIDLIST, ILGetNext, 731 LPITEMIDLIST, pidl) 704 LPITEMIDLIST WIN32API ILGetNext(LPITEMIDLIST pidl) 732 705 { 733 706 #ifdef __WIN32OS2__ … … 754 727 * Destroys the passed in idlist! (???) 755 728 */ 756 ODINFUNCTION3(LPITEMIDLIST, ILAppend, 757 LPITEMIDLIST ,pidl,758 LPCITEMIDLIST ,item,759 BOOL ,bEnd)729 LPITEMIDLIST WIN32API ILAppend( 730 LPITEMIDLIST pidl, 731 LPCITEMIDLIST item, 732 BOOL bEnd) 760 733 { 761 734 LPITEMIDLIST idlRet; … … 794 767 * exported by ordinal 795 768 */ 796 ODINFUNCTION1(DWORD, ILFree, 797 LPITEMIDLIST, pidl) 798 { 799 #ifdef __WIN32OS2__ 800 return HEAP_free(pidl); 801 #else 769 DWORD ILFree(LPITEMIDLIST pidl) 770 { 802 771 if(!pidl) 803 772 return FALSE; 804 773 SHFree(pidl); 805 774 return TRUE; 806 #endif807 775 } 808 776 /************************************************************************* … … 810 778 * 811 779 */ 812 ODINPROCEDURE1(ILGlobalFree, 813 LPCITEMIDLIST, pidl) 780 void WIN32API ILGlobalFree(LPCITEMIDLIST pidl) 814 781 { 815 782 TRACE("%p\n",pidl); … … 822 789 * 823 790 */ 824 ODINFUNCTION1(LPITEMIDLIST, ILCreateFromPathA, 825 LPCSTR, path) 791 LPITEMIDLIST WIN32API ILCreateFromPathA(LPCSTR path) 826 792 { 827 793 LPITEMIDLIST pidlnew; … … 836 802 837 803 838 ODINFUNCTION1(LPITEMIDLIST, ILCreateFromPathW, 839 LPCWSTR, path) 804 LPITEMIDLIST WIN32API ILCreateFromPathW(LPCWSTR path) 840 805 { 841 806 LPITEMIDLIST pidlnew; … … 857 822 * SHSimpleIDListFromPath [SHELL32.162] 858 823 */ 859 ODINFUNCTION1(LPITEMIDLIST, SHSimpleIDListFromPathA, 860 LPCSTR, lpszPath) 824 LPITEMIDLIST WIN32API SHSimpleIDListFromPathA(LPCSTR lpszPath) 861 825 { 862 826 LPITEMIDLIST pidl=NULL; … … 886 850 887 851 888 ODINFUNCTION1(LPITEMIDLIST, SHSimpleIDListFromPathW, 889 LPCWSTR, lpszPath) 852 LPITEMIDLIST WIN32API SHSimpleIDListFromPathW(LPCWSTR lpszPath) 890 853 { 891 854 char lpszTemp[MAX_PATH]; … … 917 880 * 918 881 */ 919 ODINFUNCTION3(HRESULT, SHGetSpecialFolderLocation, 920 HWND, hwndOwner, 921 INT, nFolder, 922 LPITEMIDLIST *, ppidl) 882 HRESULT WIN32API SHGetSpecialFolderLocation(HWND hwndOwner, 883 INT nFolder, 884 LPITEMIDLIST * ppidl) 923 885 { 924 886 CHAR szPath[MAX_PATH]; … … 978 940 * we have to take all data from the pidl 979 941 */ 980 ODINFUNCTION5(HRESULT, SHGetFolderLocation, 981 HWND, hwnd, 982 int, csidl, 983 HANDLE, hToken, 984 DWORD, dwFlags, 985 LPITEMIDLIST *, ppidl) 942 HRESULT WIN32API SHGetFolderLocation(HWND hwnd, int csidl, 943 HANDLE hToken, 944 DWORD dwFlags, 945 LPITEMIDLIST * ppidl) 986 946 { 987 947 FIXME("0x%04x 0x%08x 0x%08x 0x%08lx %p\n", … … 997 957 * we have to take all data from the pidl 998 958 */ 999 ODINFUNCTION5(HRESULT, SHGetDataFromIDListA, 1000 LPSHELLFOLDER, psf, 1001 LPCITEMIDLIST, pidl, 1002 int, nFormat, 1003 LPVOID, dest, 1004 int, len) 959 HRESULT WIN32API SHGetDataFromIDListA(LPSHELLFOLDER psf, 960 LPCITEMIDLIST pidl, 961 int nFormat, 962 LPVOID dest, 963 int len) 1005 964 { 1006 965 TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); … … 1041 1000 * 1042 1001 */ 1043 ODINFUNCTION5(HRESULT, SHGetDataFromIDListW, 1044 LPSHELLFOLDER ,psf,1045 LPCITEMIDLIST ,pidl,1046 int ,nFormat,1047 LPVOID ,dest,1048 int ,len)1002 HRESULT WIN32API SHGetDataFromIDListW( 1003 LPSHELLFOLDER psf, 1004 LPCITEMIDLIST pidl, 1005 int nFormat, 1006 LPVOID dest, 1007 int len) 1049 1008 { 1050 1009 TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len); … … 1104 1063 * fnGetDisplayNameOf can return different types of OLEString 1105 1064 */ 1106 ODINFUNCTION2(BOOL, SHGetPathFromIDListA, 1107 LPCITEMIDLIST ,pidl,1108 LPSTR ,pszPath)1065 BOOL WIN32API SHGetPathFromIDListA( 1066 LPCITEMIDLIST pidl, 1067 LPSTR pszPath) 1109 1068 { STRRET str; 1110 1069 LPSHELLFOLDER shellfolder; … … 1141 1100 * SHGetPathFromIDListW [SHELL32.262] 1142 1101 */ 1143 ODINFUNCTION2(BOOL, SHGetPathFromIDListW, 1144 LPCITEMIDLIST ,pidl,1145 LPWSTR ,pszPath)1102 BOOL WIN32API SHGetPathFromIDListW( 1103 LPCITEMIDLIST pidl, 1104 LPWSTR pszPath) 1146 1105 { char sTemp[MAX_PATH]; 1147 1106 … … 1159 1118 * SHBindToParent [shell version 5.0] 1160 1119 */ 1161 ODINFUNCTION4(HRESULT, SHBindToParent, 1162 LPCITEMIDLIST ,pidl,1163 REFIID ,riid,1164 LPVOID * ,ppv,1165 LPCITEMIDLIST * ,ppidlLast)1120 HRESULT WIN32API SHBindToParent( 1121 LPCITEMIDLIST pidl, 1122 REFIID riid, 1123 LPVOID * ppv, 1124 LPCITEMIDLIST *ppidlLast) 1166 1125 { 1167 1126 IShellFolder * psf; … … 1210 1169 * SHGetPathFromIDListAW [SHELL32.221][NT 4.0: SHELL32.219] 1211 1170 */ 1212 ODINFUNCTION2(BOOL, SHGetPathFromIDListAW, 1213 LPCITEMIDLIST, pidl, 1214 LPVOID, pszPath) 1171 BOOL WIN32API SHGetPathFromIDListAW(LPCITEMIDLIST pidl, 1172 LPVOID pszPath) 1215 1173 { 1216 1174 TRACE_(shell)("(pidl=%p,%p)\n",pidl,pszPath); -
trunk/src/shell32/sh.cpp
r5618 r7904 1 /* $Id: sh.cpp,v 1.1 2 2001-04-28 13:33:45sandervl Exp $ */1 /* $Id: sh.cpp,v 1.13 2002-02-14 12:10:09 sandervl Exp $ */ 2 2 3 3 /* … … 61 61 *****************************************************************************/ 62 62 63 ODINFUNCTION1(LPITEMIDLIST, SHBrowseForFolder, 64 LPBROWSEINFOA, lpbi) 63 LPITEMIDLIST WIN32API SHBrowseForFolder(LPBROWSEINFOA lpbi) 65 64 { 66 65 dprintf(("SHELL32: SHBrowseForFolder not implemented.\n")); … … 84 83 *****************************************************************************/ 85 84 86 ODINFUNCTION1(LPITEMIDLIST, SHBrowseForFolderW, 87 LPBROWSEINFOA, lpbi) 85 LPITEMIDLIST WIN32API SHBrowseForFolderW(LPBROWSEINFOA lpbi) 88 86 { 89 87 dprintf(("SHELL32: SHBrowseForFolderW not implemented.\n")); … … 105 103 *****************************************************************************/ 106 104 107 ODINFUNCTION3(DWORD, SHEmptyRecycleBinA, 108 DWORD, x1, 109 DWORD, x2, 110 DWORD, x3) 105 DWORD WIN32API SHEmptyRecycleBinA(DWORD x1, DWORD x2, DWORD x3) 111 106 { 112 107 dprintf(("SHELL32: SHEmptyRecycleBinA not implemented.\n")); … … 128 123 *****************************************************************************/ 129 124 130 ODINFUNCTION3(DWORD, SHEmptyRecycleBinW, 131 DWORD, x1, 132 DWORD, x2, 133 DWORD, x3) 125 DWORD WIN32API SHEmptyRecycleBinW(DWORD x1, DWORD x2, DWORD x3) 134 126 { 135 127 dprintf(("SHELL32: SHEmptyRecycleBinW not implemented.\n")); … … 151 143 *****************************************************************************/ 152 144 153 ODINFUNCTION4(DWORD, SHFormatDrive, 154 DWORD, x1, 155 DWORD, x2, 156 DWORD, x3, 157 DWORD, x4) 145 DWORD WIN32API SHFormatDrive(DWORD x1, DWORD x2, DWORD x3, DWORD x4) 158 146 { 159 147 dprintf(("SHELL32: SHFormatDrive not implemented.\n")); … … 175 163 *****************************************************************************/ 176 164 177 ODINFUNCTION1(DWORD, SHFreeNameMappings, 178 DWORD, x1) 165 DWORD WIN32API SHFreeNameMappings(DWORD x1) 179 166 { 180 167 dprintf(("SHELL32: SHFreeNameMappings not implemented.\n")); … … 196 183 *****************************************************************************/ 197 184 198 ODINFUNCTION5(DWORD, SHGetNewLinkInfo, 199 DWORD, x1, 200 DWORD, x2, 201 DWORD, x3, 202 DWORD, x4, 203 DWORD, x5) 185 DWORD WIN32API SHGetNewLinkInfo(DWORD x1, DWORD x2, DWORD x3, DWORD x4, 186 DWORD x5) 204 187 { 205 188 dprintf(("SHELL32: SHGetNewLinkInfo not implemented.\n")); … … 221 204 *****************************************************************************/ 222 205 223 ODINFUNCTION4(DWORD, SHHelpShortcuts_RunDLLA, 224 DWORD, x1, 225 DWORD, x2, 226 DWORD, x3, 227 DWORD, x4) 206 DWORD WIN32API SHHelpShortcuts_RunDLLA(DWORD x1, DWORD x2, DWORD x3, 207 DWORD x4) 228 208 { 229 209 dprintf(("SHELL32: SHHelpShortcuts_RunDLLA not implemented.\n")); … … 245 225 *****************************************************************************/ 246 226 247 ODINFUNCTION4(DWORD, SHHelpShortcuts_RunDLLW, 248 DWORD, x1, 249 DWORD, x2, 250 DWORD, x3, 251 DWORD, x4) 227 DWORD WIN32API SHHelpShortcuts_RunDLLW(DWORD x1, DWORD x2, DWORD x3, 228 DWORD x4) 252 229 { 253 230 dprintf(("SHELL32: SHHelpShortcuts_RunDLLW not implemented.\n")); … … 269 246 *****************************************************************************/ 270 247 271 ODINFUNCTION2(DWORD, SHQueryRecycleBinA, 272 DWORD, x1, 273 DWORD, x2) 248 DWORD WIN32API SHQueryRecycleBinA(DWORD x1, DWORD x2) 274 249 { 275 250 dprintf(("SHELL32: SHQueryRecycleBinA not implemented.\n")); … … 291 266 *****************************************************************************/ 292 267 293 ODINFUNCTION2(DWORD, SHQueryRecycleBinW, 294 DWORD, x1, 295 DWORD, x2) 268 DWORD WIN32API SHQueryRecycleBinW(DWORD x1, DWORD x2) 296 269 { 297 270 dprintf(("SHELL32: SHQueryRecycleBinW not implemented.\n")); … … 313 286 *****************************************************************************/ 314 287 315 ODINFUNCTION0(DWORD, SHUpdateRecycleBinIcon)288 DWORD WIN32API SHUpdateRecycleBinIcon() 316 289 { 317 290 dprintf(("SHELL32: SHUpdateRecycleBinIcon() not implemented.\n")); -
trunk/src/shell32/she.cpp
r1214 r7904 1 /* $Id: she.cpp,v 1. 7 1999-10-09 11:13:20sandervl Exp $ */1 /* $Id: she.cpp,v 1.8 2002-02-14 12:10:09 sandervl Exp $ */ 2 2 3 3 /* … … 52 52 *****************************************************************************/ 53 53 54 ODINFUNCTION1(HRESULT, SheSetCurDrive, 55 DWORD, x1) 54 HRESULT WIN32API SheSetCurDrive(DWORD x1) 56 55 { 57 56 dprintf(("SHELL32: SheSetCurDrive not implemented.\n")); … … 73 72 *****************************************************************************/ 74 73 75 ODINFUNCTION1(HRESULT, SheRemoveQuotesA, 76 LPCSTR, lpszString) 74 HRESULT WIN32API SheRemoveQuotesA(LPCSTR lpszString) 77 75 { 78 76 dprintf(("SHELL32: SheRemoveQuotesA\n not implemented")); … … 94 92 *****************************************************************************/ 95 93 96 ODINFUNCTION1(HRESULT, SheRemoveQuotesW, 97 LPCWSTR, lpszString) 94 HRESULT WIN32API SheRemoveQuotesW(LPCWSTR lpszString) 98 95 { 99 96 dprintf(("SHELL32: SheRemoveQuotesW\n not implemented")); -
trunk/src/shell32/shell32.def
r5618 r7904 1 ; $Id: shell32.def,v 1.3 5 2001-04-28 13:33:45sandervl Exp $1 ; $Id: shell32.def,v 1.36 2002-02-14 12:10:10 sandervl Exp $ 2 2 3 3 ; Based on Windows 95 … … 310 310 ; Shl1632_ThunkData32 = _Shl1632_ThunkData32@? @299 311 311 ; Shl3216_ThunkData32 = _Shl3216_ThunkData32@? @300 312 ;;SHLWAPI forwarders 312 313 StrChrA = _StrChrA@8 @301 313 314 StrChrIA = _StrChrIA@8 @302 … … 327 328 StrNCpyW = _lstrcpynW@12 @316 328 329 StrRChrA = _StrRChrA@12 @317 329 ; StrRChrIA = _StrRChrIA@8@318330 ; StrRChrIW = _StrRChrIW@8@319330 StrRChrIA = _StrRChrIA@12 @318 331 StrRChrIW = _StrRChrIW@12 @319 331 332 StrRChrW = _StrRChrW@12 @320 332 333 ; StrRStrA = _StrRStrA@? @321 333 ; StrRStrIA = _StrRStrIA@8@322334 ; StrRStrIW = _StrRStrIW@8@323334 StrRStrIA = _StrRStrIA@12 @322 335 StrRStrIW = _StrRStrIW@12 @323 335 336 ; StrRStrW = _StrRStrW@? @324 336 337 StrStrA = _StrStrA@8 @325 … … 338 339 StrStrIW = _StrStrIW@8 @327 339 340 StrStrW = _StrStrW@8 @328 341 ;;SHLWAPI forwarders end 340 342 ; WOWShellExecute = _WOWShellExecute@? @329 341 343 SHRegCloseKey = _SHRegCloseKey@4 @505 -
trunk/src/shell32/shell32_odin.cpp
r4544 r7904 1 /* $Id: shell32_odin.cpp,v 1. 2 2000-10-28 14:36:48sandervl Exp $ */1 /* $Id: shell32_odin.cpp,v 1.3 2002-02-14 12:10:10 sandervl Exp $ */ 2 2 3 3 /* … … 250 250 */ 251 251 252 ODINFUNCTION4(BOOL,ShellAboutA, HWND, hWnd, 253 LPCSTR, szApp, 254 LPCSTR, szOtherStuff, 255 HICON, hIcon ) 252 BOOL WIN32API ShellAboutA(HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, 253 HICON hIcon ) 256 254 { ABOUT_INFO info; 257 255 HRSRC hRes; … … 275 273 * ShellAboutW [SHELL32.244] 276 274 */ 277 ODINFUNCTION4(BOOL,ShellAboutW, HWND, hWnd, 278 LPCWSTR, szApp, 279 LPCWSTR, szOtherStuff, 280 HICON, hIcon ) 275 BOOL WIN32API ShellAboutW(HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, 276 HICON hIcon ) 281 277 { INT ret; 282 278 ABOUT_INFO info; … … 306 302 * executable) and patch parameters if needed. 307 303 */ 308 ODINFUNCTION3(HICON, ExtractAssociatedIconA, 309 HINSTANCE, hInst, 310 LPSTR, lpIconPath, 311 LPWORD, lpiIcon) 304 HICON WIN32API ExtractAssociatedIconA(HINSTANCE hInst, LPSTR lpIconPath, 305 LPWORD lpiIcon) 312 306 { 313 307 HICON hIcon; … … 983 977 */ 984 978 985 ODINFUNCTION6(HINSTANCE, ShellExecuteA, HWND, hWnd, 986 LPCSTR, lpOperation, 987 LPCSTR, lpFile, 988 LPCSTR, lpParameters, 989 LPCSTR, lpDirectory, 990 INT, iShowCmd ) 979 HINSTANCE WIN32API ShellExecuteA(HWND hWnd, LPCSTR lpOperation, 980 LPCSTR lpFile, 981 LPCSTR lpParameters, 982 LPCSTR lpDirectory, 983 INT iShowCmd ) 991 984 { HINSTANCE retval=31; 992 985 char old_dir[1024]; … … 1119 1112 *****************************************************************************/ 1120 1113 1121 ODINFUNCTION4(UINT, DragQueryFileAorW, 1122 HDROP, hDrop, 1123 UINT, iFile, 1124 LPTSTR, lpszFile, 1125 UINT, cch) 1114 UINT WIN32API DragQueryFileAorW(HDROP hDrop, UINT iFile, LPTSTR lpszFile, 1115 UINT cch) 1126 1116 { 1127 1117 // @@@PH maybe they want automatic determination here -
trunk/src/shell32/shellord.c
r7502 r7904 106 106 * 107 107 */ 108 ODINFUNCTION7(BOOL, GetFileNameFromBrowse, 109 HWND, hwndOwner, 110 LPSTR, lpstrFile, 111 DWORD, nMaxFile, 112 LPCSTR, lpstrInitialDir, 113 LPCSTR, lpstrDefExt, 114 LPCSTR, lpstrFilter, 115 LPCSTR, lpstrTitle) 108 BOOL WIN32API GetFileNameFromBrowse(HWND hwndOwner, LPSTR lpstrFile, 109 DWORD nMaxFile, LPCSTR lpstrInitialDir, 110 LPCSTR lpstrDefExt, LPCSTR lpstrFilter, 111 LPCSTR lpstrTitle) 116 112 { 117 113 FIXME("(%04x,%s,%ld,%s,%s,%s,%s):stub.\n", … … 332 328 #define MEM_DEBUG 0 333 329 334 ODINPROCEDURE1(SHFree, 335 LPVOID, x) 330 void WIN32API SHFree(LPVOID x) 336 331 { 337 332 #if MEM_DEBUG … … 367 362 * exported by ordinal 368 363 */ 369 ODINFUNCTION1(LPVOID, SHAlloc, 370 DWORD, len) 364 LPVOID WIN32API SHAlloc(DWORD len) 371 365 { 372 366 LPBYTE ret; -
trunk/src/shell32/shellstub.cpp
r7085 r7904 1 /* $Id: shellstub.cpp,v 1. 4 2001-10-17 09:15:22 phallerExp $ */1 /* $Id: shellstub.cpp,v 1.5 2002-02-14 12:10:11 sandervl Exp $ */ 2 2 3 3 /* … … 38 38 39 39 40 ODINDEBUGCHANNEL(SHELL32-SHELLSTUB) 41 42 ODINFUNCTION3(DWORD, SHCreateStdEnumFmtEtc, DWORD, x1, DWORD, x2, DWORD, x3) 40 DWORD WIN32API SHCreateStdEnumFmtEtc(DWORD x1, DWORD x2, DWORD x3) 43 41 { 44 42 dprintf(("STUB!")); … … 46 44 } 47 45 48 ODINFUNCTION2(DWORD, SHFindFiles, DWORD, x1, DWORD,x2)46 DWORD WIN32API SHFindFiles( DWORD x1, DWORD x2) 49 47 { 50 48 dprintf(("STUB!")); … … 52 50 } 53 51 54 ODINFUNCTION2(DWORD, SHFindComputer, DWORD, x1, DWORD,x2)52 DWORD WIN32API SHFindComputer(DWORD x1, DWORD x2) 55 53 { 56 54 dprintf(("STUB!")); … … 58 56 } 59 57 60 ODINFUNCTION3(DWORD, DAD_AutoScroll, DWORD, x1, DWORD, x2, DWORD,x3)58 DWORD WIN32API DAD_AutoScroll(DWORD x1, DWORD x2, DWORD x3) 61 59 { 62 60 dprintf(("STUB!")); … … 64 62 } 65 63 66 ODINFUNCTION1(DWORD, DAD_DragEnter, DWORD,x1)64 DWORD WIN32API DAD_DragEnter(DWORD x1) 67 65 { 68 66 dprintf(("STUB!")); … … 70 68 } 71 69 72 ODINFUNCTION3(DWORD, DAD_DragEnterEx, DWORD, x1, DWORD, x2, DWORD,x3)70 DWORD WIN32API DAD_DragEnterEx(DWORD x1, DWORD x2, DWORD x3) 73 71 { 74 72 dprintf(("STUB!")); … … 76 74 } 77 75 78 ODINFUNCTION0(DWORD, DAD_DragLeave)76 DWORD WIN32API DAD_DragLeave() 79 77 { 80 78 dprintf(("STUB!")); … … 82 80 } 83 81 84 ODINFUNCTION2(DWORD, DAD_DragMove, DWORD, x1, DWORD,x2)82 DWORD WIN32API DAD_DragMove(DWORD x1, DWORD x2) 85 83 { 86 84 dprintf(("STUB!")); … … 88 86 } 89 87 90 ODINFUNCTION1(DWORD, Desktop_UpdateBriefcaseOnEvent, DWORD,x1)88 DWORD WIN32API Desktop_UpdateBriefcaseOnEvent(DWORD x1) 91 89 { 92 90 dprintf(("STUB!")); … … 94 92 } 95 93 96 ODINFUNCTION1(DWORD, InvalidateDriveType, DWORD,x1)94 DWORD WIN32API InvalidateDriveType(DWORD x1) 97 95 { 98 96 dprintf(("STUB!")); … … 101 99 102 100 103 ODINFUNCTION1(DWORD, SHGlobalDefect, DWORD,x1)101 DWORD WIN32API SHGlobalDefect(DWORD x1) 104 102 { 105 103 dprintf(("STUB!")); … … 107 105 } 108 106 109 ODINFUNCTION2(DWORD, SHHandleDiskFull, DWORD, x1, DWORD,x2)107 DWORD WIN32API SHHandleDiskFull(DWORD x1, DWORD x2) 110 108 { 111 109 dprintf(("STUB!")); -
trunk/src/shell32/shlfileop.c
r6800 r7904 698 698 DWORD WINAPI SHFileOperationW (LPSHFILEOPSTRUCTW lpFileOp) 699 699 { 700 #ifdef __WIN32OS2__701 FIXME(__FUNCTION__"(%p) ,stub\n", lpFileOp);702 #else703 700 FIXME("(%p):stub.\n", lpFileOp); 704 #endif705 701 return 1; 706 702 } … … 722 718 */ 723 719 HRESULT WINAPI SheGetDirW(LPWSTR u, LPWSTR v) 724 #ifdef __WIN32OS2__725 { FIXME(__FUNCTION__"(%p, %p) ,stub\n",u,v);726 #else727 720 { FIXME("%p %p stub\n",u,v); 728 #endif729 721 return 0; 730 722 } … … 735 727 */ 736 728 HRESULT WINAPI SheChangeDirW(LPWSTR u) 737 #ifdef __WIN32OS2__738 { FIXME(__FUNCTION__"(%s),stub\n",debugstr_w(u));739 #else740 729 { FIXME("(%s),stub\n",debugstr_w(u)); 741 #endif742 730 return 0; 743 731 } -
trunk/src/shell32/unknown.cpp
r5472 r7904 1 /* $Id: unknown.cpp,v 1.1 0 2001-04-04 09:02:15sandervl Exp $ */1 /* $Id: unknown.cpp,v 1.11 2002-02-14 12:10:12 sandervl Exp $ */ 2 2 3 3 /* … … 53 53 *****************************************************************************/ 54 54 55 ODINFUNCTION6(HINSTANCE, RealShellExecuteA, 56 HWND, hwnd, 57 LPCTSTR, lpOperation, 58 LPCTSTR, lpFile, 59 LPCTSTR, lpParameters, 60 LPCTSTR, lpDirectory, 61 INT, nShowCmd) 55 HINSTANCE WIN32API RealShellExecuteA(HWND hwnd, LPCTSTR lpOperation, 56 LPCTSTR lpFile, LPCTSTR lpParameters, 57 LPCTSTR lpDirectory, INT nShowCmd) 62 58 { 63 59 dprintf (("SHELL32: RealShellExecuteA not implemented.\n")); … … 84 80 *****************************************************************************/ 85 81 86 ODINFUNCTION6(HINSTANCE, RealShellExecuteW, 87 HWND, hwnd, 88 LPCWSTR, lpOperation, 89 LPCWSTR, lpFile, 90 LPCWSTR, lpParameters, 91 LPCWSTR, lpDirectory, 92 INT, nShowCmd) 82 HINSTANCE WIN32API RealShellExecuteW(HWND hwnd, LPCTSTR lpOperation, 83 LPCWSTR lpFile, LPCWSTR lpParameters, 84 LPCWSTR lpDirectory, INT nShowCmd) 93 85 { 94 86 HINSTANCE hInstance; … … 134 126 *****************************************************************************/ 135 127 136 ODINFUNCTION1(BOOL, RealShellExecuteExA, 137 LPSHELLEXECUTEINFOA, lpExecInfo) 128 BOOL WIN32API RealShellExecuteExA(LPSHELLEXECUTEINFOA lpExecInfo) 138 129 { 139 130 dprintf(("SHELL32: RealShellExecuteExA not implemented.\n")); … … 155 146 *****************************************************************************/ 156 147 157 ODINFUNCTION1(BOOL, RealShellExecuteExW, 158 LPSHELLEXECUTEINFOW, lpExecInfo) 148 BOOL WIN32API RealShellExecuteExW(LPSHELLEXECUTEINFOW lpExecInfo) 159 149 { 160 150 dprintf(("SHELL32: RealShellExecuteExW not implemented.\n")); … … 176 166 *****************************************************************************/ 177 167 178 ODINFUNCTION2(DWORD, RegenerateUserEnvironment, 179 DWORD, x1, 180 DWORD, x2) 168 DWORD WIN32API RegenerateUserEnvironment(DWORD x1, DWORD x2) 181 169 { 182 170 dprintf(("SHELL32: RegenerateUserEnvironment not implemented.\n")); … … 198 186 *****************************************************************************/ 199 187 200 ODINFUNCTION3(DWORD, RestartDialog, 201 DWORD, x1, 202 DWORD, x2, 203 DWORD, x3) 188 DWORD WIN32API RestartDialog(DWORD x1, DWORD x2, DWORD x3) 204 189 { 205 190 dprintf(("SHELL32: RestartDialog not implemented.\n")); … … 221 206 *****************************************************************************/ 222 207 223 ODINFUNCTION2(DWORD, SheConvertPathW, 224 DWORD, x1, 225 DWORD, x2) 208 DWORD WIN32API SheConvertPathW(DWORD x1, DWORD x2) 226 209 { 227 210 dprintf(("SHELL32: SheConvertPathW not implemented.\n")); … … 243 226 *****************************************************************************/ 244 227 245 ODINFUNCTION2(DWORD, SheShortenPathW, 246 DWORD, x1, 247 DWORD, x2) 228 DWORD WIN32API SheShortenPathW(DWORD x1, DWORD x2) 248 229 { 249 230 dprintf(("SHELL32: SheShortenPathW not implemented.\n")); … … 265 246 *****************************************************************************/ 266 247 267 ODINFUNCTION2(DWORD, SheShortenPathA, 268 DWORD, x1, 269 DWORD, x2) 248 DWORD WIN32API SheShortenPathA(DWORD x1, DWORD x2) 270 249 { 271 250 dprintf(("SHELL32: SheShortenPathA not implemented.\n")); … … 279 258 * 280 259 */ 281 ODINFUNCTION4(HRESULT,SHRegQueryValueA,HKEY, hkey, 282 LPSTR, lpszSubKey, 283 LPSTR, lpszData, 284 LPDWORD,lpcbData ) 260 HRESULT WIN32API SHRegQueryValueA(HKEY hkey, LPSTR lpszSubKey, 261 LPSTR lpszData, LPDWORD lpcbData ) 285 262 { dprintf(("SHELL32:UNKNOWN:SHRegQueryValueA(0x%04x %s %p %p semi-stub\n", 286 263 hkey, lpszSubKey, lpszData, lpcbData));
Note:
See TracChangeset
for help on using the changeset viewer.