December 2012 - Wine-commits

Francois Gouget : gdi32: Make make_rgb_colorref() static.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 166e7c7381b1c3848d328dd281ae57e02f4b6b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=166e7c7381b1c3848d328dd28… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 7 12:31:16 2012 +0100 gdi32: Make make_rgb_colorref() static. --- dlls/gdi32/dibdrv/dibdrv.h | 1 - dlls/gdi32/dibdrv/objects.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index b780268..4152f2e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -245,7 +245,6 @@ extern void free_dib_info(dib_info *dib) DECLSPEC_HIDDEN; extern void free_pattern_brush(dib_brush *brush) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; -extern COLORREF make_rgb_colorref( HDC hdc, const dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) DECLSPEC_HIDDEN; extern DWORD get_pixel_color( HDC hdc, const dib_info *dib, COLORREF color, BOOL mono_fixup ) DECLSPEC_HIDDEN; extern int clip_rect_to_dib( const dib_info *dib, RECT *rc ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 96c0e7a..5ff9d1a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -135,7 +135,7 @@ static inline BOOL rgbquad_equal(const RGBQUAD *a, const RGBQUAD *b) return FALSE; } -COLORREF make_rgb_colorref( HDC hdc, const dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) +static COLORREF make_rgb_colorref( HDC hdc, const dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) { *pixel = 0; *got_pixel = FALSE;

1 0

Alexandre Julliard : gdi32: Simplify list processing by using the LIST_FOR_EACH_ENTRY macro.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: d3c128346b50c546d9e247a76cc0f87ad1a3a4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c128346b50c546d9e247a76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 14:29:28 2012 +0100 gdi32: Simplify list processing by using the LIST_FOR_EACH_ENTRY macro. --- dlls/gdi32/freetype.c | 183 ++++++++++++++++++------------------------------ 1 files changed, 69 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3c128346b50c546d9e24…

1 0

Alexandre Julliard : gdi32: Keep track of the number of fonts on the unused list.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 06dced4eaae078ea701eb8bb593075801fff75ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=06dced4eaae078ea701eb8bb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 7 14:36:22 2012 +0100 gdi32: Keep track of the number of fonts on the unused list. --- dlls/gdi32/freetype.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5cf34ca..ce8bbd9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -375,6 +375,7 @@ struct enum_charset_list { static struct list gdi_font_list = LIST_INIT(gdi_font_list); static struct list unused_gdi_font_list = LIST_INIT(unused_gdi_font_list); +static unsigned int unused_font_count; #define UNUSED_CACHE_SIZE 10 static struct list system_links = LIST_INIT(system_links); @@ -4307,6 +4308,7 @@ static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const FMAT2 *pma hflist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hflist)); hflist->hfont = hfont; list_add_head(&ret->hfontlist, &hflist->entry); + unused_font_count--; return ret; } return NULL; @@ -5021,7 +5023,6 @@ BOOL WineEngDestroyFontInstance(HFONT handle) GdiFont *gdiFont, *next; HFONTLIST *hflist, *hfnext; BOOL ret = FALSE; - int i = 0; GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); @@ -5044,17 +5045,16 @@ BOOL WineEngDestroyFontInstance(HFONT handle) TRACE("Moving to Unused list\n"); list_remove(&gdiFont->entry); list_add_head(&unused_gdi_font_list, &gdiFont->entry); + if (unused_font_count > UNUSED_CACHE_SIZE) + { + gdiFont = LIST_ENTRY( list_tail( &unused_gdi_font_list ), struct tagGdiFont, entry ); + TRACE("freeing %p\n", gdiFont); + list_remove(&gdiFont->entry); + free_font(gdiFont); + } + else unused_font_count++; } } - - - LIST_FOR_EACH_ENTRY_SAFE( gdiFont, next, &unused_gdi_font_list, struct tagGdiFont, entry ) - { - if (i++ < UNUSED_CACHE_SIZE) continue; - TRACE("freeing %p\n", gdiFont); - list_remove(&gdiFont->entry); - free_font(gdiFont); - } LeaveCriticalSection( &freetype_cs ); return ret; }

1 0

Jacek Caban : vbscript: Use simplified constant implementation for more constants.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: d10d989feddd5dfc8ffac7d9e5cf8ff357c0a3b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10d989feddd5dfc8ffac7d9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 7 13:00:35 2012 +0100 vbscript: Use simplified constant implementation for more constants. --- dlls/vbscript/global.c | 56 ++++++------------------------------------------ 1 files changed, 7 insertions(+), 49 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 420a5a5..cba4edc 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1638,48 +1638,6 @@ static HRESULT Global_vbSystemModal(vbdisp_t *This, VARIANT *arg, unsigned args_ return E_NOTIMPL; } -static HRESULT Global_vbOK(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDOK); -} - -static HRESULT Global_vbCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDCANCEL); -} - -static HRESULT Global_vbAbort(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDABORT); -} - -static HRESULT Global_vbRetry(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDRETRY); -} - -static HRESULT Global_vbIgnore(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDIGNORE); -} - -static HRESULT Global_vbYes(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDYES); -} - -static HRESULT Global_vbNo(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - TRACE("\n"); - return return_short(res, IDNO); -} - static HRESULT Global_vbTrue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1907,13 +1865,13 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBDEFAULTBUTTON4, Global_vbDefaultButton4, BP_GET}, {DISPID_GLOBAL_VBAPPLICATIONMODAL, Global_vbApplicationModal, BP_GET}, {DISPID_GLOBAL_VBSYSTEMMODAL, Global_vbSystemModal, BP_GET}, - {DISPID_GLOBAL_VBOK, Global_vbOK, BP_GET}, - {DISPID_GLOBAL_VBCANCEL, Global_vbCancel, BP_GET}, - {DISPID_GLOBAL_VBABORT, Global_vbAbort, BP_GET}, - {DISPID_GLOBAL_VBRETRY, Global_vbRetry, BP_GET}, - {DISPID_GLOBAL_VBIGNORE, Global_vbIgnore, BP_GET}, - {DISPID_GLOBAL_VBYES, Global_vbYes, BP_GET}, - {DISPID_GLOBAL_VBNO, Global_vbNo, BP_GET}, + {DISPID_GLOBAL_VBOK, NULL, BP_GET, IDOK}, + {DISPID_GLOBAL_VBCANCEL, NULL, BP_GET, IDCANCEL}, + {DISPID_GLOBAL_VBABORT, NULL, BP_GET, IDABORT}, + {DISPID_GLOBAL_VBRETRY, NULL, BP_GET, IDRETRY}, + {DISPID_GLOBAL_VBIGNORE, NULL, BP_GET, IDIGNORE}, + {DISPID_GLOBAL_VBYES, NULL, BP_GET, IDYES}, + {DISPID_GLOBAL_VBNO, NULL, BP_GET, IDNO}, {DISPID_GLOBAL_VBEMPTY, NULL, BP_GET, VT_EMPTY}, {DISPID_GLOBAL_VBNULL, NULL, BP_GET, VT_NULL}, {DISPID_GLOBAL_VBINTEGER, NULL, BP_GET, VT_I2},

1 0

André Hentschel : schannel/tests: Fix test on win8.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 30fd27e1173cc6ace459f2aa100fe6b84367dd98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fd27e1173cc6ace459f2aa1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 6 19:28:08 2012 +0100 schannel/tests: Fix test on win8. --- dlls/schannel/tests/main.c | 18 +++++++++++++++--- include/sspi.h | 4 ++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index b576848..83c107a 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -45,6 +45,17 @@ ValidateTargetInfo) #define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) +#define LSA_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_EXTENDED_ERROR | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_STREAM | \ + SECPKG_FLAG_MUTUAL_AUTH ) + static NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE*, PULONG); static NTSTATUS (NTAPI *pSpUserModeInitialize)(ULONG, PULONG, @@ -179,8 +190,9 @@ static void testGetInfo(void) /* First package: Unified */ status = pTables->GetInfo(&PackageInfo); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n", - PackageInfo.fCapabilities); + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || + PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), + "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || @@ -204,7 +216,7 @@ static void testGetInfo(void) if (status == STATUS_SUCCESS) { - ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n", + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS, "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); diff --git a/include/sspi.h b/include/sspi.h index bd2241c..74bfd2f 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -131,6 +131,10 @@ typedef struct _SecPkgInfoW #define SECPKG_FLAG_DELEGATION 0x00020000 #define SECPKG_FLAG_READONLY_WITH_CHECKSUM 0x00040000 #define SECPKG_FLAG_RESTRICTED_TOKENS 0x00080000 +#define SECPKG_FLAG_NEGO_EXTENDER 0x00100000 +#define SECPKG_FLAG_NEGOTIABLE2 0x00200000 +#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 +#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 #define SECPKG_ID_NONE 0xffff

1 0

André Hentschel : secur32/tests: Fix tests on win8.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 1eaa25696b1f7b487bfc246dd029a588b14b010e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eaa25696b1f7b487bfc246dd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 6 19:28:55 2012 +0100 secur32/tests: Fix tests on win8. --- dlls/secur32/tests/negotiate.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index 9aca5b6..e70c1e8 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -329,7 +329,9 @@ static void test_authentication(void) { ok( pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || - pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS), + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", pi->fCapabilities ); ok( pi->wVersion == 1, "got %u\n", pi->wVersion ); ok( pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID ); @@ -372,7 +374,9 @@ START_TEST(negotiate) } ok( info->fCapabilities == NEGOTIATE_BASE_CAPS || info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || - info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS), + info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + info->fCapabilities == (NEGOTIATE_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", info->fCapabilities ); ok( info->wVersion == 1, "got %u\n", info->wVersion ); ok( info->wRPCID == RPC_C_AUTHN_GSS_NEGOTIATE, "got %u\n", info->wRPCID );

1 0

Andrew Talbot : windowscodecs: Remove unneeded address-of operators from array names.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 4bb2c61b39668a02f68e859afc2a8de7aa434b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb2c61b39668a02f68e859af… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 22:41:52 2012 +0000 windowscodecs: Remove unneeded address-of operators from array names. --- dlls/windowscodecs/gifformat.c | 2 +- dlls/windowscodecs/jpegformat.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index ce63af9..84838e2 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1362,7 +1362,7 @@ static HRESULT WINAPI GifDecoder_Block_GetReaderByIndex(IWICMetadataBlockReader if (!reader) return E_INVALIDARG; if (index == 0) - return create_metadata_reader(&This->LSD_data, sizeof(This->LSD_data), + return create_metadata_reader(This->LSD_data, sizeof(This->LSD_data), &CLSID_WICLSDMetadataReader, reader); for (i = 0; i < This->gif->Extensions.ExtensionBlockCount; i++) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 57f1b55..6463de5 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1022,7 +1022,7 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface HeapFree(GetProcessHeap(), 0, swapped_data); return E_FAIL; } - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; if (!This->started_compress) { @@ -1189,7 +1189,7 @@ static HRESULT WINAPI JpegEncoder_Frame_Commit(IWICBitmapFrameEncode *iface) LeaveCriticalSection(&This->lock); return E_FAIL; } - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; pjpeg_finish_compress(&This->cinfo); @@ -1299,7 +1299,7 @@ static HRESULT WINAPI JpegEncoder_Initialize(IWICBitmapEncoder *iface, This->cinfo.err = &This->jerr; - This->cinfo.client_data = &jmpbuf; + This->cinfo.client_data = jmpbuf; if (setjmp(jmpbuf)) {

1 0

Andrew Talbot : user32: Remove unneeded address-of operator from array name .
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 51f936adc28187f0aaaacb8651b2dc3c68d3a137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f936adc28187f0aaaacb865… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 22:41:45 2012 +0000 user32: Remove unneeded address-of operator from array name. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 08098c0..f17db6e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1123,7 +1123,7 @@ static BOOL set_entry( void *ptr, UINT int_param, void *ptr_param, UINT flags ) #define BINARY_ENTRY(name,data) \ struct sysparam_binary_entry entry_##name = { { get_binary_entry, set_binary_entry, init_binary_entry, \ - name ##_VALNAME }, &(data), sizeof(data) } + name ##_VALNAME }, data, sizeof(data) } #define PATH_ENTRY(name) \ struct sysparam_binary_entry entry_##name = { { get_path_entry, set_path_entry, init_path_entry, \

1 0

Andrew Talbot : urlmon: Remove unneeded address-of operator from array name .
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: c1c970e0906d3bc6b193d875b67633fff02e8f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c970e0906d3bc6b193d875b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 6 22:41:42 2012 +0000 urlmon: Remove unneeded address-of operator from array name. --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 0a68b43..90113f2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5184,7 +5184,7 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) data = heap_alloc(size); if(!data) return E_OUTOFMEMORY; - hr = IStream_Read(pStm, &data->unk1, size-sizeof(DWORD)-2, NULL); + hr = IStream_Read(pStm, data->unk1, size-sizeof(DWORD)-2, NULL); if(FAILED(hr)) { heap_free(data); return hr;

1 0

Henri Verbeet : ddraw: Avoid LPDDPIXELFORMAT.
by Alexandre Julliard 07 Dec '12

07 Dec '12

Module: wine Branch: master Commit: 9a7bb01a9590fd74fa1c5bb5785c64772a4cb59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7bb01a9590fd74fa1c5bb57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 7 00:07:04 2012 +0100 ddraw: Avoid LPDDPIXELFORMAT. --- include/d3dtypes.h | 2 +- include/ddraw.h | 10 +++++----- include/ddrawi.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/d3dtypes.h b/include/d3dtypes.h index 256d99a..01752b7 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -73,7 +73,7 @@ typedef LONG D3DFIXED; typedef HRESULT (CALLBACK *LPD3DVALIDATECALLBACK)(LPVOID lpUserArg, DWORD dwOffset); typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext); -typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext); +typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(DDPIXELFORMAT *format, void *ctx); #ifndef DX_SHARED_DEFINES diff --git a/include/ddraw.h b/include/ddraw.h index 25ea77e..536a58e 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1891,7 +1891,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown) /*48*/ STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; /*4c*/ STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; /*50*/ STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; -/*54*/ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; +/*54*/ STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; /*58*/ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; /*5c*/ STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; /*60*/ STDMETHOD(IsLost)(THIS) PURE; @@ -2025,7 +2025,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; @@ -2171,7 +2171,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; @@ -2322,7 +2322,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; @@ -2489,7 +2489,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(GetFlipStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetOverlayPosition)(THIS_ LPLONG lplX, LPLONG lplY) PURE; STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; - STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; + STDMETHOD(GetPixelFormat)(THIS_ DDPIXELFORMAT *format) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; diff --git a/include/ddrawi.h b/include/ddrawi.h index a695a1c..1210d2c 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -820,7 +820,7 @@ typedef struct _DDRAWI_DIRECTDRAW_GBL { /* DirectX 6.0 */ ULONG_PTR lpD3DHALCallbacks3; DWORD dwNumZPixelFormats; - LPDDPIXELFORMAT lpZPixelFormats; + DDPIXELFORMAT *lpZPixelFormats; LPDDRAWI_DDMOTIONCOMP_INT mcList; DWORD hDDVxd; DDSCAPSEX ddsCapsMore;

1 0