mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-14 19:47:27 +00:00
atl100: ReadFile doesn't directly return an error code.
This commit is contained in:
parent
22cb898c9e
commit
87d8250117
|
@ -495,15 +495,13 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist
|
||||||
DWORD filelen, len;
|
DWORD filelen, len;
|
||||||
LPWSTR regstrw;
|
LPWSTR regstrw;
|
||||||
LPSTR regstra;
|
LPSTR regstra;
|
||||||
LRESULT lres;
|
|
||||||
HRESULT hres;
|
HRESULT hres;
|
||||||
|
|
||||||
file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
|
file = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
|
||||||
if(file != INVALID_HANDLE_VALUE) {
|
if(file != INVALID_HANDLE_VALUE) {
|
||||||
filelen = GetFileSize(file, NULL);
|
filelen = GetFileSize(file, NULL);
|
||||||
regstra = HeapAlloc(GetProcessHeap(), 0, filelen);
|
regstra = HeapAlloc(GetProcessHeap(), 0, filelen);
|
||||||
lres = ReadFile(file, regstra, filelen, NULL, NULL);
|
if(ReadFile(file, regstra, filelen, NULL, NULL)) {
|
||||||
if(lres == ERROR_SUCCESS) {
|
|
||||||
len = MultiByteToWideChar(CP_ACP, 0, regstra, filelen, NULL, 0)+1;
|
len = MultiByteToWideChar(CP_ACP, 0, regstra, filelen, NULL, 0)+1;
|
||||||
regstrw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR));
|
regstrw = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(WCHAR));
|
||||||
MultiByteToWideChar(CP_ACP, 0, regstra, filelen, regstrw, len);
|
MultiByteToWideChar(CP_ACP, 0, regstra, filelen, regstrw, len);
|
||||||
|
@ -514,7 +512,7 @@ static HRESULT file_register(Registrar *This, LPCOLESTR fileName, BOOL do_regist
|
||||||
HeapFree(GetProcessHeap(), 0, regstrw);
|
HeapFree(GetProcessHeap(), 0, regstrw);
|
||||||
}else {
|
}else {
|
||||||
WARN("Failed to read faile\n");
|
WARN("Failed to read faile\n");
|
||||||
hres = HRESULT_FROM_WIN32(lres);
|
hres = HRESULT_FROM_WIN32(GetLastError());
|
||||||
}
|
}
|
||||||
HeapFree(GetProcessHeap(), 0, regstra);
|
HeapFree(GetProcessHeap(), 0, regstra);
|
||||||
CloseHandle(file);
|
CloseHandle(file);
|
||||||
|
|
Loading…
Reference in a new issue