Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
87b09067
Commit
87b09067
authored
20 years ago
by
Francois Gouget
Committed by
Alexandre Julliard
20 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Assorted spelling fixes.
parent
151015fa
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
24 deletions
+24
-24
mesa.c
dlls/ddraw/d3ddevice/mesa.c
+8
-8
d3dtexture.c
dlls/ddraw/d3dtexture.c
+1
-1
d3dviewport.c
dlls/ddraw/d3dviewport.c
+1
-1
prop.c
dlls/mapi32/prop.c
+2
-2
prop.c
dlls/mapi32/tests/prop.c
+8
-8
action.c
dlls/msi/action.c
+1
-1
db.c
dlls/msi/tests/db.c
+1
-1
record.c
dlls/msi/tests/record.c
+1
-1
oleauto.h
include/oleauto.h
+1
-1
No files found.
dlls/ddraw/d3ddevice/mesa.c
View file @
87b09067
...
@@ -3153,7 +3153,7 @@ d3ddevice_blt(IDirectDrawSurfaceImpl *This, LPRECT rdst,
...
@@ -3153,7 +3153,7 @@ d3ddevice_blt(IDirectDrawSurfaceImpl *This, LPRECT rdst,
x_stretch
=
(
double
)
(
rect
.
u3
.
x2
-
rect
.
u1
.
x1
)
/
(
double
)
width
;
x_stretch
=
(
double
)
(
rect
.
u3
.
x2
-
rect
.
u1
.
x1
)
/
(
double
)
width
;
y_stretch
=
(
double
)
(
rect
.
u4
.
y2
-
rect
.
u2
.
y1
)
/
(
double
)
height
;
y_stretch
=
(
double
)
(
rect
.
u4
.
y2
-
rect
.
u2
.
y1
)
/
(
double
)
height
;
TRACE
(
" using memory to buffer Blt overide.
\n
"
);
TRACE
(
" using memory to buffer Blt over
r
ide.
\n
"
);
ENTER_GL
();
ENTER_GL
();
...
@@ -3161,7 +3161,7 @@ d3ddevice_blt(IDirectDrawSurfaceImpl *This, LPRECT rdst,
...
@@ -3161,7 +3161,7 @@ d3ddevice_blt(IDirectDrawSurfaceImpl *This, LPRECT rdst,
if
(
upload_surface_to_tex_memory_init
(
src_impl
,
0
,
&
gl_d3d_dev
->
current_internal_format
,
if
(
upload_surface_to_tex_memory_init
(
src_impl
,
0
,
&
gl_d3d_dev
->
current_internal_format
,
initial
,
((
dwFlags
&
DDBLT_KEYSRC
)
!=
0
),
UNLOCK_TEX_SIZE
,
UNLOCK_TEX_SIZE
)
!=
DD_OK
)
{
initial
,
((
dwFlags
&
DDBLT_KEYSRC
)
!=
0
),
UNLOCK_TEX_SIZE
,
UNLOCK_TEX_SIZE
)
!=
DD_OK
)
{
ERR
(
" unsupported pixel format at memory to buffer Blt overide.
\n
"
);
ERR
(
" unsupported pixel format at memory to buffer Blt over
r
ide.
\n
"
);
LEAVE_GL
();
LEAVE_GL
();
return
DDERR_INVALIDPARAMS
;
return
DDERR_INVALIDPARAMS
;
}
}
...
@@ -3172,7 +3172,7 @@ d3ddevice_blt(IDirectDrawSurfaceImpl *This, LPRECT rdst,
...
@@ -3172,7 +3172,7 @@ d3ddevice_blt(IDirectDrawSurfaceImpl *This, LPRECT rdst,
else
else
glDrawBuffer
(
GL_BACK
);
glDrawBuffer
(
GL_BACK
);
/* Now the serious stuff happens. This is basically the same code
that
for the memory
/* Now the serious stuff happens. This is basically the same code
as
for the memory
flush to frame buffer ... with stretching and different rectangles added :-) */
flush to frame buffer ... with stretching and different rectangles added :-) */
for
(
y
=
0
;
y
<
height
;
y
+=
UNLOCK_TEX_SIZE
)
{
for
(
y
=
0
;
y
<
height
;
y
+=
UNLOCK_TEX_SIZE
)
{
RECT
flush_rect
;
RECT
flush_rect
;
...
@@ -3274,7 +3274,7 @@ d3ddevice_bltfast(IDirectDrawSurfaceImpl *This, DWORD dstx,
...
@@ -3274,7 +3274,7 @@ d3ddevice_bltfast(IDirectDrawSurfaceImpl *This, DWORD dstx,
if
(
setup_rect_and_surface_for_blt
(
This
,
&
buffer_type
,
(
D3DRECT
*
)
&
rdst
)
!=
DD_OK
)
return
DDERR_INVALIDPARAMS
;
if
(
setup_rect_and_surface_for_blt
(
This
,
&
buffer_type
,
(
D3DRECT
*
)
&
rdst
)
!=
DD_OK
)
return
DDERR_INVALIDPARAMS
;
TRACE
(
" using BltFast memory to frame buffer overide.
\n
"
);
TRACE
(
" using BltFast memory to frame buffer over
r
ide.
\n
"
);
ENTER_GL
();
ENTER_GL
();
...
@@ -3283,7 +3283,7 @@ d3ddevice_bltfast(IDirectDrawSurfaceImpl *This, DWORD dstx,
...
@@ -3283,7 +3283,7 @@ d3ddevice_bltfast(IDirectDrawSurfaceImpl *This, DWORD dstx,
if
(
upload_surface_to_tex_memory_init
(
src_impl
,
0
,
&
gl_d3d_dev
->
current_internal_format
,
if
(
upload_surface_to_tex_memory_init
(
src_impl
,
0
,
&
gl_d3d_dev
->
current_internal_format
,
initial
,
(
trans
&
DDBLTFAST_SRCCOLORKEY
)
!=
0
,
initial
,
(
trans
&
DDBLTFAST_SRCCOLORKEY
)
!=
0
,
UNLOCK_TEX_SIZE
,
UNLOCK_TEX_SIZE
)
!=
DD_OK
)
{
UNLOCK_TEX_SIZE
,
UNLOCK_TEX_SIZE
)
!=
DD_OK
)
{
ERR
(
" unsupported pixel format at memory to buffer Blt overide.
\n
"
);
ERR
(
" unsupported pixel format at memory to buffer Blt over
r
ide.
\n
"
);
LEAVE_GL
();
LEAVE_GL
();
return
DDERR_INVALIDPARAMS
;
return
DDERR_INVALIDPARAMS
;
}
}
...
@@ -3978,9 +3978,9 @@ d3ddevice_create(IDirect3DDeviceImpl **obj, IDirectDrawImpl *d3d, IDirectDrawSur
...
@@ -3978,9 +3978,9 @@ d3ddevice_create(IDirect3DDeviceImpl **obj, IDirectDrawImpl *d3d, IDirectDrawSur
surf2
->
aux_blt
=
d3ddevice_blt
;
surf2
->
aux_blt
=
d3ddevice_blt
;
surf2
->
aux_bltfast
=
d3ddevice_bltfast
;
surf2
->
aux_bltfast
=
d3ddevice_bltfast
;
TRACE
(
" overiding direct surface access.
\n
"
);
TRACE
(
" over
r
iding direct surface access.
\n
"
);
}
else
{
}
else
{
TRACE
(
" no overide.
\n
"
);
TRACE
(
" no over
r
ide.
\n
"
);
}
}
surf2
->
d3ddevice
=
object
;
surf2
->
d3ddevice
=
object
;
}
}
...
@@ -4172,7 +4172,7 @@ static void fill_caps(void)
...
@@ -4172,7 +4172,7 @@ static void fill_caps(void)
opengl_device_caps
.
dwReserved3
=
0
;
opengl_device_caps
.
dwReserved3
=
0
;
opengl_device_caps
.
dwReserved4
=
0
;
opengl_device_caps
.
dwReserved4
=
0
;
/* And now some GL overides :-) */
/* And now some GL over
r
ides :-) */
glGetIntegerv
(
GL_MAX_TEXTURE_SIZE
,
(
GLint
*
)
&
opengl_device_caps
.
dwMaxTextureWidth
);
glGetIntegerv
(
GL_MAX_TEXTURE_SIZE
,
(
GLint
*
)
&
opengl_device_caps
.
dwMaxTextureWidth
);
opengl_device_caps
.
dwMaxTextureHeight
=
opengl_device_caps
.
dwMaxTextureWidth
;
opengl_device_caps
.
dwMaxTextureHeight
=
opengl_device_caps
.
dwMaxTextureWidth
;
opengl_device_caps
.
dwMaxTextureAspectRatio
=
opengl_device_caps
.
dwMaxTextureWidth
;
opengl_device_caps
.
dwMaxTextureAspectRatio
=
opengl_device_caps
.
dwMaxTextureWidth
;
...
...
This diff is collapsed.
Click to expand it.
dlls/ddraw/d3dtexture.c
View file @
87b09067
...
@@ -889,7 +889,7 @@ HRESULT d3dtexture_create(IDirectDrawImpl *d3d, IDirectDrawSurfaceImpl *surf, BO
...
@@ -889,7 +889,7 @@ HRESULT d3dtexture_create(IDirectDrawImpl *d3d, IDirectDrawSurfaceImpl *surf, BO
surf
->
aux_setcolorkey_cb
=
gltex_setcolorkey_cb
;
surf
->
aux_setcolorkey_cb
=
gltex_setcolorkey_cb
;
surf
->
set_palette
=
gltex_set_palette
;
surf
->
set_palette
=
gltex_set_palette
;
/* We are the only one to use the aux_blt and aux_bltfast overides, so no need
/* We are the only one to use the aux_blt and aux_bltfast over
r
ides, so no need
to save those... */
to save those... */
surf
->
aux_blt
=
gltex_blt
;
surf
->
aux_blt
=
gltex_blt
;
surf
->
aux_bltfast
=
gltex_bltfast
;
surf
->
aux_bltfast
=
gltex_bltfast
;
...
...
This diff is collapsed.
Click to expand it.
dlls/ddraw/d3dviewport.c
View file @
87b09067
...
@@ -198,7 +198,7 @@ Main_IDirect3DViewportImpl_3_2_1_SetViewport(LPDIRECT3DVIEWPORT3 iface,
...
@@ -198,7 +198,7 @@ Main_IDirect3DViewportImpl_3_2_1_SetViewport(LPDIRECT3DVIEWPORT3 iface,
memset
(
&
(
This
->
viewports
.
vp1
),
0
,
sizeof
(
This
->
viewports
.
vp1
));
memset
(
&
(
This
->
viewports
.
vp1
),
0
,
sizeof
(
This
->
viewports
.
vp1
));
memcpy
(
&
(
This
->
viewports
.
vp1
),
lpData
,
lpData
->
dwSize
);
memcpy
(
&
(
This
->
viewports
.
vp1
),
lpData
,
lpData
->
dwSize
);
/* Tests on two games show
s that these values are never used properly so ove
ride
/* Tests on two games show
that these values are never used properly so over
ride
them with proper ones :-)
them with proper ones :-)
*/
*/
This
->
viewports
.
vp1
.
dvMinZ
=
0
.
0
;
This
->
viewports
.
vp1
.
dvMinZ
=
0
.
0
;
...
...
This diff is collapsed.
Click to expand it.
dlls/mapi32/prop.c
View file @
87b09067
...
@@ -1636,7 +1636,7 @@ IMAPIProp_fnSaveChanges(LPMAPIPROP iface, ULONG ulFlags)
...
@@ -1636,7 +1636,7 @@ IMAPIProp_fnSaveChanges(LPMAPIPROP iface, ULONG ulFlags)
* successfully.
* successfully.
* NOTES
* NOTES
* - If MAPI_W_ERRORS_RETURNED is returned, any properties that could not be
* - If MAPI_W_ERRORS_RETURNED is returned, any properties that could not be
* retrieved from iface are present in lppProps with th
ie
r type
* retrieved from iface are present in lppProps with th
ei
r type
* changed to PT_ERROR and Id unchanged.
* changed to PT_ERROR and Id unchanged.
*/
*/
static
inline
HRESULT
WINAPI
static
inline
HRESULT
WINAPI
...
@@ -1985,7 +1985,7 @@ IMAPIProp_fnCopyProps(LPMAPIPROP iface, LPSPropTagArray lpInclProps,
...
@@ -1985,7 +1985,7 @@ IMAPIProp_fnCopyProps(LPMAPIPROP iface, LPSPropTagArray lpInclProps,
/**************************************************************************
/**************************************************************************
* IMAPIProp_GetNamesFromIDs {MAPI32}
* IMAPIProp_GetNamesFromIDs {MAPI32}
*
*
* Get the names of properties from th
ie
r identifiers.
* Get the names of properties from th
ei
r identifiers.
*
*
* PARAMS
* PARAMS
* iface [I] IMAPIProp object to operate on
* iface [I] IMAPIProp object to operate on
...
...
This diff is collapsed.
Click to expand it.
dlls/mapi32/tests/prop.c
View file @
87b09067
...
@@ -636,7 +636,7 @@ static void test_PpropFindProp(void)
...
@@ -636,7 +636,7 @@ static void test_PpropFindProp(void)
ptTypes
[
i
]);
ptTypes
[
i
]);
pRet
=
pPpropFindProp
(
&
pvProp
,
1u
,
i
?
ptTypes
[
i
-
1
]
:
ptTypes
[
i
+
1
]);
pRet
=
pPpropFindProp
(
&
pvProp
,
1u
,
i
?
ptTypes
[
i
-
1
]
:
ptTypes
[
i
+
1
]);
ok
(
pRet
==
NULL
,
"PpropFindProp[%ld]: Found non-exist
ing
propery
\n
"
,
ok
(
pRet
==
NULL
,
"PpropFindProp[%ld]: Found non-exist
ent
propery
\n
"
,
ptTypes
[
i
]);
ptTypes
[
i
]);
}
}
...
@@ -868,11 +868,11 @@ static void test_LpValFindProp(void)
...
@@ -868,11 +868,11 @@ static void test_LpValFindProp(void)
ptTypes
[
i
]);
ptTypes
[
i
]);
pRet
=
pLpValFindProp
(
PROP_TAG
(
ptTypes
[
i
],
0u
),
1u
,
&
pvProp
);
pRet
=
pLpValFindProp
(
PROP_TAG
(
ptTypes
[
i
],
0u
),
1u
,
&
pvProp
);
ok
(
pRet
==
NULL
,
"LpValFindProp[%ld]: Found non-exist
ing
propery id
\n
"
,
ok
(
pRet
==
NULL
,
"LpValFindProp[%ld]: Found non-exist
ent
propery id
\n
"
,
ptTypes
[
i
]);
ptTypes
[
i
]);
pRet
=
pLpValFindProp
(
PROP_TAG
(
PT_NULL
,
0u
),
1u
,
&
pvProp
);
pRet
=
pLpValFindProp
(
PROP_TAG
(
PT_NULL
,
0u
),
1u
,
&
pvProp
);
ok
(
pRet
==
NULL
,
"LpValFindProp[%ld]: Found non-exist
ing
propery id/type
\n
"
,
ok
(
pRet
==
NULL
,
"LpValFindProp[%ld]: Found non-exist
ent
propery id/type
\n
"
,
ptTypes
[
i
]);
ptTypes
[
i
]);
pRet
=
pLpValFindProp
(
PROP_TAG
(
PT_NULL
,
1u
),
1u
,
&
pvProp
);
pRet
=
pLpValFindProp
(
PROP_TAG
(
PT_NULL
,
1u
),
1u
,
&
pvProp
);
...
@@ -1257,22 +1257,22 @@ static void test_IProp(void)
...
@@ -1257,22 +1257,22 @@ static void test_IProp(void)
tags
.
aulPropTag
[
0
]
=
PR_RESPONSE_REQUESTED
;
tags
.
aulPropTag
[
0
]
=
PR_RESPONSE_REQUESTED
;
sc
=
IPropData_DeleteProps
(
lpIProp
,
(
LPSPropTagArray
)
&
tags
,
&
lpProbs
);
sc
=
IPropData_DeleteProps
(
lpIProp
,
(
LPSPropTagArray
)
&
tags
,
&
lpProbs
);
ok
(
sc
==
E_ACCESSDENIED
&&
!
lpProbs
,
ok
(
sc
==
E_ACCESSDENIED
&&
!
lpProbs
,
"DeleteProps(non-exist
a
nt): Expected E_ACCESSDENIED null got 0x%08lX %p
\n
"
,
"DeleteProps(non-exist
e
nt): Expected E_ACCESSDENIED null got 0x%08lX %p
\n
"
,
sc
,
lpProbs
);
sc
,
lpProbs
);
/* Set access to read and write */
/* Set access to read and write */
sc
=
IPropData_HrSetObjAccess
(
lpIProp
,
IPROP_READWRITE
);
sc
=
IPropData_HrSetObjAccess
(
lpIProp
,
IPROP_READWRITE
);
ok
(
sc
==
S_OK
,
"SetObjAcess(WRITE): Expected S_OK got 0x%08lX
\n
"
,
sc
);
ok
(
sc
==
S_OK
,
"SetObjAcess(WRITE): Expected S_OK got 0x%08lX
\n
"
,
sc
);
/* Delete non
exista
nt item - No error */
/* Delete non
-existe
nt item - No error */
lpProbs
=
NULL
;
lpProbs
=
NULL
;
tags
.
aulPropTag
[
0
]
=
PR_RESPONSE_REQUESTED
;
tags
.
aulPropTag
[
0
]
=
PR_RESPONSE_REQUESTED
;
sc
=
IPropData_DeleteProps
(
lpIProp
,
(
LPSPropTagArray
)
&
tags
,
&
lpProbs
);
sc
=
IPropData_DeleteProps
(
lpIProp
,
(
LPSPropTagArray
)
&
tags
,
&
lpProbs
);
ok
(
sc
==
S_OK
&&
!
lpProbs
,
ok
(
sc
==
S_OK
&&
!
lpProbs
,
"DeleteProps(non-exist
a
nt): Expected S_OK null got 0x%08lX %p
\n
"
,
"DeleteProps(non-exist
e
nt): Expected S_OK null got 0x%08lX %p
\n
"
,
sc
,
lpProbs
);
sc
,
lpProbs
);
/* Delete exist
ant
item (r/o) - No error, but lpProbs populated */
/* Delete exist
ing
item (r/o) - No error, but lpProbs populated */
lpProbs
=
NULL
;
lpProbs
=
NULL
;
tags
.
aulPropTag
[
0
]
=
PR_IMPORTANCE
;
tags
.
aulPropTag
[
0
]
=
PR_IMPORTANCE
;
sc
=
IPropData_DeleteProps
(
lpIProp
,
(
LPSPropTagArray
)
&
tags
,
&
lpProbs
);
sc
=
IPropData_DeleteProps
(
lpIProp
,
(
LPSPropTagArray
)
&
tags
,
&
lpProbs
);
...
@@ -1318,7 +1318,7 @@ static void test_IProp(void)
...
@@ -1318,7 +1318,7 @@ static void test_IProp(void)
sc
=
IPropData_HrSetPropAccess
(
lpIProp
,
(
LPSPropTagArray
)
&
tags
,
access
);
sc
=
IPropData_HrSetPropAccess
(
lpIProp
,
(
LPSPropTagArray
)
&
tags
,
access
);
ok
(
sc
==
S_OK
,
"SetPropAcess(WRITE): Expected S_OK got 0x%08lX
\n
"
,
sc
);
ok
(
sc
==
S_OK
,
"SetPropAcess(WRITE): Expected S_OK got 0x%08lX
\n
"
,
sc
);
/* Delete exist
ant
item (r/w) - No error, no problems */
/* Delete exist
ing
item (r/w) - No error, no problems */
lpProbs
=
NULL
;
lpProbs
=
NULL
;
sc
=
IPropData_DeleteProps
(
lpIProp
,
(
LPSPropTagArray
)
&
tags
,
&
lpProbs
);
sc
=
IPropData_DeleteProps
(
lpIProp
,
(
LPSPropTagArray
)
&
tags
,
&
lpProbs
);
ok
(
sc
==
S_OK
&&
!
lpProbs
,
ok
(
sc
==
S_OK
&&
!
lpProbs
,
...
...
This diff is collapsed.
Click to expand it.
dlls/msi/action.c
View file @
87b09067
...
@@ -716,7 +716,7 @@ static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start,
...
@@ -716,7 +716,7 @@ static void ui_actioninfo(MSIPACKAGE *package, LPCWSTR action, BOOL start,
* The arguments following count are a list of path segments.
* The arguments following count are a list of path segments.
* A path segment may be NULL.
* A path segment may be NULL.
*
*
* Path segments will be added with a \ sep
e
rating them.
* Path segments will be added with a \ sep
a
rating them.
* A \ will not be added after the last segment, however if the
* A \ will not be added after the last segment, however if the
* last segment is NULL, then the last character will be a \
* last segment is NULL, then the last character will be a \
*
*
...
...
This diff is collapsed.
Click to expand it.
dlls/msi/tests/db.c
View file @
87b09067
/*
/*
* Copyright (C) 2005 Mike McCormack for Code
w
eavers
* Copyright (C) 2005 Mike McCormack for Code
W
eavers
*
*
* A test program for MSI database files.
* A test program for MSI database files.
*
*
...
...
This diff is collapsed.
Click to expand it.
dlls/msi/tests/record.c
View file @
87b09067
/*
/*
* Copyright (C) 2005 Mike McCormack for Code
w
eavers
* Copyright (C) 2005 Mike McCormack for Code
W
eavers
*
*
* A test program for MSI records
* A test program for MSI records
*
*
...
...
This diff is collapsed.
Click to expand it.
include/oleauto.h
View file @
87b09067
...
@@ -207,7 +207,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANT*,VARIANT*,LCID,USHORT,VARTYPE);
...
@@ -207,7 +207,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANT*,VARIANT*,LCID,USHORT,VARTYPE);
#define VAR_TIMEVALUEONLY 0x001
/* Ignore date portion of VT_DATE */
#define VAR_TIMEVALUEONLY 0x001
/* Ignore date portion of VT_DATE */
#define VAR_DATEVALUEONLY 0x002
/* Ignore time portion of VT_DATE */
#define VAR_DATEVALUEONLY 0x002
/* Ignore time portion of VT_DATE */
#define VAR_VALIDDATE 0x004
#define VAR_VALIDDATE 0x004
#define VAR_CALENDAR_HIJRI 0x008
/* Use the Hijri calend
e
r */
#define VAR_CALENDAR_HIJRI 0x008
/* Use the Hijri calend
a
r */
#define VAR_LOCALBOOL 0x010
/* VT_BOOL<->VT_BSTR: Use localised boolean text */
#define VAR_LOCALBOOL 0x010
/* VT_BOOL<->VT_BSTR: Use localised boolean text */
#define VAR_FORMAT_NOSUBSTITUTE 0x020
/* Don't change format strings for un-coercable types */
#define VAR_FORMAT_NOSUBSTITUTE 0x020
/* Don't change format strings for un-coercable types */
#define VAR_FOURDIGITYEARS 0x040
/* Always print years with 4 digits */
#define VAR_FOURDIGITYEARS 0x040
/* Always print years with 4 digits */
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment