Skip to content

W
wine-cw
Commit 6096e586 authored by Ge van Geldorp's avatar Ge van Geldorp Committed by Alexandre Julliard
Browse files
Options

ntdll: Widen fields in LDR_RESOURCE_INFO to accomodate 64 bit pointers.

parent 15ad5de1
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
dlls/kernel/resource.c
View file @ 6096e586
...@@ -137,8 +137,8 @@ static HRSRC find_resourceA( HMODULE hModule, LPCSTR type, LPCSTR name, WORD lan ...@@ -137,8 +137,8 @@ static HRSRC find_resourceA( HMODULE hModule, LPCSTR type, LPCSTR name, WORD lan
{ {
if ((status = get_res_nameA( name, &nameW )) != STATUS_SUCCESS) goto done; if ((status = get_res_nameA( name, &nameW )) != STATUS_SUCCESS) goto done;
if ((status = get_res_nameA( type, &typeW )) != STATUS_SUCCESS) goto done; if ((status = get_res_nameA( type, &typeW )) != STATUS_SUCCESS) goto done;
info.Type = (ULONG)typeW.Buffer; info.Type = (ULONG_PTR)typeW.Buffer;
info.Name = (ULONG)nameW.Buffer; info.Name = (ULONG_PTR)nameW.Buffer;
info.Language = lang; info.Language = lang;
status = LdrFindResource_U( hModule, &info, 3, &entry ); status = LdrFindResource_U( hModule, &info, 3, &entry );
done: done:
...@@ -170,8 +170,8 @@ static HRSRC find_resourceW( HMODULE hModule, LPCWSTR type, LPCWSTR name, WORD l ...@@ -170,8 +170,8 @@ static HRSRC find_resourceW( HMODULE hModule, LPCWSTR type, LPCWSTR name, WORD l
{ {
if ((status = get_res_nameW( name, &nameW )) != STATUS_SUCCESS) goto done; if ((status = get_res_nameW( name, &nameW )) != STATUS_SUCCESS) goto done;
if ((status = get_res_nameW( type, &typeW )) != STATUS_SUCCESS) goto done; if ((status = get_res_nameW( type, &typeW )) != STATUS_SUCCESS) goto done;
info.Type = (ULONG)typeW.Buffer; info.Type = (ULONG_PTR)typeW.Buffer;
info.Name = (ULONG)nameW.Buffer; info.Name = (ULONG_PTR)nameW.Buffer;
info.Language = lang; info.Language = lang;
status = LdrFindResource_U( hModule, &info, 3, &entry ); status = LdrFindResource_U( hModule, &info, 3, &entry );
done: done:
...@@ -495,8 +495,8 @@ BOOL WINAPI EnumResourceLanguagesA( HMODULE hmod, LPCSTR type, LPCSTR name, ...@@ -495,8 +495,8 @@ BOOL WINAPI EnumResourceLanguagesA( HMODULE hmod, LPCSTR type, LPCSTR name,
goto done; goto done;
if ((status = get_res_nameA( name, &nameW )) != STATUS_SUCCESS) if ((status = get_res_nameA( name, &nameW )) != STATUS_SUCCESS)
goto done; goto done;
info.Type = (ULONG)typeW.Buffer; info.Type = (ULONG_PTR)typeW.Buffer;
info.Name = (ULONG)nameW.Buffer; info.Name = (ULONG_PTR)nameW.Buffer;
if ((status = LdrFindResourceDirectory_U( hmod, &info, 2, &resdir )) != STATUS_SUCCESS) if ((status = LdrFindResourceDirectory_U( hmod, &info, 2, &resdir )) != STATUS_SUCCESS)
goto done; goto done;
...@@ -538,8 +538,8 @@ BOOL WINAPI EnumResourceLanguagesW( HMODULE hmod, LPCWSTR type, LPCWSTR name, ...@@ -538,8 +538,8 @@ BOOL WINAPI EnumResourceLanguagesW( HMODULE hmod, LPCWSTR type, LPCWSTR name,
goto done; goto done;
if ((status = get_res_nameW( name, &nameW )) != STATUS_SUCCESS) if ((status = get_res_nameW( name, &nameW )) != STATUS_SUCCESS)
goto done; goto done;
info.Type = (ULONG)typeW.Buffer; info.Type = (ULONG_PTR)typeW.Buffer;
info.Name = (ULONG)nameW.Buffer; info.Name = (ULONG_PTR)nameW.Buffer;
if ((status = LdrFindResourceDirectory_U( hmod, &info, 2, &resdir )) != STATUS_SUCCESS) if ((status = LdrFindResourceDirectory_U( hmod, &info, 2, &resdir )) != STATUS_SUCCESS)
goto done; goto done;
......
include/winternl.h
View file @ 6096e586
...@@ -1245,8 +1245,8 @@ typedef BOOLEAN (WINAPI * PWINSTATIONQUERYINFORMATIONW)(HANDLE,ULONG,WINSTATIONI ...@@ -1245,8 +1245,8 @@ typedef BOOLEAN (WINAPI * PWINSTATIONQUERYINFORMATIONW)(HANDLE,ULONG,WINSTATIONI
typedef struct _LDR_RESOURCE_INFO typedef struct _LDR_RESOURCE_INFO
{ {
ULONG Type; ULONG_PTR Type;
ULONG Name; ULONG_PTR Name;
ULONG Language; ULONG Language;
} LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO; } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment