Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 02:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix a few bugs

Browse source 
svn path=/trunk/; revision=29749
This commit is contained in:
Johannes Anderwald 2007-10-21 18:42:01 +00:00
parent eb32aa038b
commit b8fd4333c7
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
reactos/dll/win32/shell32/shv_bg_cmenu.c
View file

@ -34,6 +34,8 @@
#include "shell32_main.h" #include "shell32_main.h"
#include "shellfolder.h" #include "shellfolder.h"
#include "undocshell.h" #include "undocshell.h"
#include "shlwapi.h"
#include "stdio.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DEFAULT_DEBUG_CHANNEL(shell);
@ -269,11 +271,11 @@ DoShellNewCmd(BgCmImpl * This, LPCMINVOKECOMMANDINFO lpcmi)
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
UINT i, target; UINT i, target;
HANDLE hFile; HANDLE hFile;
DWORD dwWritten; DWORD dwWritten, dwError;
static const WCHAR szNew[] = { 'N','e','w',' ',0 }; //FIXME static const WCHAR szNew[] = { 'N','e','w',' ',0 }; //FIXME
static const WCHAR szP1[] = { '%', '1', 0 }; static const WCHAR szP1[] = { '%', '1', 0 };
static const WCHAR szFormat[] = {'%','s',' ','(','%','u',')','%','s',0 }; static const WCHAR szFormat[] = {'%','s',' ','(','%','d',')','%','s',0 };
i = This->iIdShellNewFirst; i = This->iIdShellNewFirst;
@ -317,7 +319,7 @@ DoShellNewCmd(BgCmImpl * This, LPCMINVOKECOMMANDINFO lpcmi)
ERR("IShellFolder_GetDisplayNameOf failed\n"); ERR("IShellFolder_GetDisplayNameOf failed\n");
return; return;
} }
StrRetToBufW(strTemp, pidl, szPath, MAX_PATH); StrRetToBufW(&strTemp, pidl, szPath, MAX_PATH);
} }
switch(pCurItem->Type) switch(pCurItem->Type)
{ {
@ -336,7 +338,7 @@ DoShellNewCmd(BgCmImpl * This, LPCMINVOKECOMMANDINFO lpcmi)
if (ptr) if (ptr)
{ {
ptr[1] = 's'; ptr[1] = 's';
swprintf(szTemp, szBuffer, szPath); sprintfW(szTemp, szBuffer, szPath);
ptr = szTemp; ptr = szTemp;
} }
else else
@ -370,25 +372,35 @@ DoShellNewCmd(BgCmImpl * This, LPCMINVOKECOMMANDINFO lpcmi)
wcscat(szBuffer, pCurItem->szExt); wcscat(szBuffer, pCurItem->szExt);
do do
{ {
TRACE("FileName %s szBuffer %s i %d \n", debugstr_w(szBuffer), debugstr_w(szPath), i);
hFile = CreateFileW(szBuffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); hFile = CreateFileW(szBuffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
swprintf(szBuffer, szFormat, szPath, i, pCurItem->szExt); if (hFile != INVALID_HANDLE_VALUE)
break;
dwError = GetLastError();
TRACE("FileName %s szBuffer %s i %u error %x\n", debugstr_w(szBuffer), debugstr_w(szPath), i, dwError);
sprintfW(szBuffer, szFormat, szPath, i, pCurItem->szExt);
i++; i++;
}while(hFile == INVALID_HANDLE_VALUE); }while(hFile == INVALID_HANDLE_VALUE && dwError == ERROR_FILE_EXISTS);
if (hFile == INVALID_HANDLE_VALUE)
return;
if (pCurItem->Type == SHELLNEW_TYPE_DATA) if (pCurItem->Type == SHELLNEW_TYPE_DATA)
{ {
i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szBuffer, MAX_PATH*2, NULL, NULL); i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szTemp, MAX_PATH*2, NULL, NULL);
if (i) if (i)
{ {
WriteFile(hFile, (LPCVOID)szBuffer, i, &dwWritten, NULL); WriteFile(hFile, (LPCVOID)szTemp, i, &dwWritten, NULL);
} }
} }
CloseHandle(hFile); CloseHandle(hFile);
if (pCurItem->Type == SHELLNEW_TYPE_FILENAME) if (pCurItem->Type == SHELLNEW_TYPE_FILENAME)
{ {
CopyFileW(pCurItem->szTarget, szPath, FALSE); if (!CopyFileW(pCurItem->szTarget, szBuffer, FALSE))
break;
} }
TRACE("Notifying fs %s\n", debugstr_w(szBuffer));
SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)szBuffer, NULL);
break; break;
} }
} }