mirror of
https://github.com/reactos/reactos.git
synced 2024-10-02 07:26:47 +00:00
[D3DXOF]
* Sync with Wine 1.7.17. CORE-8080 svn path=/trunk/; revision=62820
This commit is contained in:
parent
b47789c216
commit
67996b30a4
|
@ -176,7 +176,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV
|
|||
HGLOBAL resource_data;
|
||||
LPDXFILELOADRESOURCE lpdxflr = pvSource;
|
||||
|
||||
TRACE("Source in resource (module = %p, name = %s, type = %s\n", lpdxflr->hModule, debugstr_a(lpdxflr->lpName), debugstr_a(lpdxflr->lpType));
|
||||
TRACE("Source in resource (module = %p, name = %s, type = %s)\n", lpdxflr->hModule, debugstr_a(lpdxflr->lpName), debugstr_a(lpdxflr->lpType));
|
||||
|
||||
resource_info = FindResourceA(lpdxflr->hModule, lpdxflr->lpName, lpdxflr->lpType);
|
||||
if (!resource_info)
|
||||
|
|
|
@ -18,6 +18,8 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#pragma makedep register
|
||||
|
||||
[
|
||||
helpstring("DirectX File"),
|
||||
threading(both),
|
||||
|
|
13
reactos/dll/directx/wine/d3dxof/d3dxof.rgs
Normal file
13
reactos/dll/directx/wine/d3dxof/d3dxof.rgs
Normal file
|
@ -0,0 +1,13 @@
|
|||
HKCR
|
||||
{
|
||||
NoRemove Interface
|
||||
{
|
||||
}
|
||||
NoRemove CLSID
|
||||
{
|
||||
'{4516EC43-8F20-11D0-9B6D-0000C0781BC3}' = s 'DirectX File'
|
||||
{
|
||||
InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' }
|
||||
}
|
||||
}
|
||||
}
|
|
@ -79,7 +79,7 @@ static const char *debugstr_fourcc(DWORD fourcc)
|
|||
(char)(fourcc >> 16), (char)(fourcc >> 24));
|
||||
}
|
||||
|
||||
static const char* get_primitive_string(WORD token)
|
||||
static const char* get_primitive_string(DWORD token)
|
||||
{
|
||||
switch(token)
|
||||
{
|
||||
|
@ -499,11 +499,11 @@ static BOOL is_name(parse_buffer* buf)
|
|||
char tmp[512];
|
||||
DWORD pos = 0;
|
||||
char c;
|
||||
BOOL error = 0;
|
||||
BOOL error = FALSE;
|
||||
while (pos < buf->rem_bytes && !is_separator(c = *(buf->buffer+pos)))
|
||||
{
|
||||
if (!(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')) || ((c >= '0') && (c <= '9')) || (c == '_') || (c == '-')))
|
||||
error = 1;
|
||||
error = TRUE;
|
||||
if (pos < sizeof(tmp))
|
||||
tmp[pos] = c;
|
||||
pos++;
|
||||
|
@ -531,7 +531,7 @@ static BOOL is_float(parse_buffer* buf)
|
|||
DWORD pos = 0;
|
||||
char c;
|
||||
float decimal;
|
||||
BOOL dot = 0;
|
||||
BOOL dot = FALSE;
|
||||
|
||||
while (pos < buf->rem_bytes && !is_separator(c = *(buf->buffer+pos)))
|
||||
{
|
||||
|
@ -591,7 +591,7 @@ static BOOL is_string(parse_buffer* buf)
|
|||
char tmp[512];
|
||||
DWORD pos = 0;
|
||||
char c;
|
||||
BOOL ok = 0;
|
||||
BOOL ok = FALSE;
|
||||
|
||||
if (*buf->buffer != '"')
|
||||
return FALSE;
|
||||
|
@ -601,7 +601,7 @@ static BOOL is_string(parse_buffer* buf)
|
|||
c = *(buf->buffer+pos+1);
|
||||
if (c == '"')
|
||||
{
|
||||
ok = 1;
|
||||
ok = TRUE;
|
||||
break;
|
||||
}
|
||||
if (pos < sizeof(tmp))
|
||||
|
@ -888,10 +888,10 @@ static inline BOOL is_primitive_type(WORD token)
|
|||
case TOKEN_LPSTR:
|
||||
case TOKEN_UNICODE:
|
||||
case TOKEN_CSTRING:
|
||||
ret = 1;
|
||||
ret = TRUE;
|
||||
break;
|
||||
default:
|
||||
ret = 0;
|
||||
ret = FALSE;
|
||||
break;
|
||||
}
|
||||
return ret;
|
||||
|
@ -937,14 +937,14 @@ static BOOL parse_template_members_list(parse_buffer * buf)
|
|||
|
||||
while (1)
|
||||
{
|
||||
BOOL array = 0;
|
||||
BOOL array = FALSE;
|
||||
int nb_dims = 0;
|
||||
cur_member = &buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].members[idx_member];
|
||||
|
||||
if (check_TOKEN(buf) == TOKEN_ARRAY)
|
||||
{
|
||||
get_TOKEN(buf);
|
||||
array = 1;
|
||||
array = TRUE;
|
||||
}
|
||||
|
||||
if (check_TOKEN(buf) == TOKEN_NAME)
|
||||
|
|
|
@ -23,4 +23,6 @@
|
|||
#define WINE_PRODUCTVERSION 5,0,2135,1
|
||||
#define WINE_PRODUCTVERSION_STR "5.0.2135.1"
|
||||
|
||||
#include "wine/wine_common_ver.rc"
|
||||
1 WINE_REGISTRY d3dxof.rgs
|
||||
|
||||
#include <wine/wine_common_ver.rc>
|
||||
|
|
|
@ -32,7 +32,7 @@ reactos/dll/directx/wine/d3d8 # Synced to Wine-1.7.17
|
|||
reactos/dll/directx/wine/d3d9 # Synced to Wine-1.7.17
|
||||
reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-1.7.17
|
||||
reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.17
|
||||
reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.1
|
||||
reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.17
|
||||
reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.17
|
||||
reactos/dll/directx/wine/devenum # Synced to Wine-1.7.1
|
||||
reactos/dll/directx/wine/dinput # Synced to Wine-1.7.1
|
||||
|
|
|
@ -42,6 +42,7 @@ AddReg=Classes
|
|||
11,,comctl32.dll,2
|
||||
11,,cryptdlg.dll,1
|
||||
11,,cryptnet.dll,1
|
||||
11,,d3dxof.dll,1
|
||||
11,,ddraw.dll,1
|
||||
11,,devenum.dll,1
|
||||
11,,dinput.dll,1
|
||||
|
|
Loading…
Reference in a new issue