December 2007 - Wine-commits

Huw Davies : inetcomm: Add IMimeAllocator implementation.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 5df59e29c9242e7f88d849d8f37ae295ce386170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df59e29c9242e7f88d849d8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 18 11:50:22 2007 +0000 inetcomm: Add IMimeAllocator implementation. --- dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/inetcomm_main.c | 8 +- dlls/inetcomm/inetcomm_private.h | 1 + dlls/inetcomm/mimeole.c | 205 ++++++++++++++++++++++++++++++++++++++ dlls/inetcomm/regsvr.c | 6 + dlls/inetcomm/tests/mimeole.c | 11 ++ 6 files changed, 230 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index a9e7d16..0266bb1 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -63,7 +63,7 @@ @ stub MimeOleGenerateCID @ stub MimeOleGenerateFileName @ stub MimeOleGenerateMID -@ stub MimeOleGetAllocator +@ stdcall MimeOleGetAllocator(ptr) @ stub MimeOleGetBodyPropA @ stub MimeOleGetBodyPropW @ stub MimeOleGetCertsFromThumbprints diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 81303b3..15350df 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -131,8 +131,8 @@ static const struct IClassFactoryVtbl cf_vtbl = cf_LockServer }; -static cf mime_body_cf = { &cf_vtbl, MimeBody_create }; - +static cf mime_body_cf = { &cf_vtbl, MimeBody_create }; +static cf mime_allocator_cf = { &cf_vtbl, MimeAllocator_create }; /*********************************************************************** * DllGetClassObject (INETCOMM.@) @@ -147,6 +147,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { cf = (IClassFactory*) &mime_body_cf.lpVtbl; } + else if( IsEqualCLSID( rclsid, &CLSID_IMimeAllocator )) + { + cf = (IClassFactory*) &mime_allocator_cf.lpVtbl; + } if ( !cf ) { diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index 2a41925..bf6e5ce 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -70,3 +70,4 @@ BOOL InternetTransport_RegisterClass(HINSTANCE hInstance); void InternetTransport_UnregisterClass(HINSTANCE hInstance); HRESULT MimeBody_create(IUnknown *outer, void **obj); +HRESULT MimeAllocator_create(IUnknown *outer, void **obj); diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 59619df..f0185d4 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1824,3 +1824,208 @@ HRESULT WINAPI MimeOleCreateSecurity(IMimeSecurity **ppSecurity) *ppSecurity = (IMimeSecurity *)&This->lpVtbl; return S_OK; } + + +typedef struct +{ + IMimeAllocatorVtbl *lpVtbl; +} MimeAllocator; + +static HRESULT WINAPI MimeAlloc_QueryInterface( + IMimeAllocator* iface, + REFIID riid, + void **obj) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IMalloc) || + IsEqualIID(riid, &IID_IMimeAllocator)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + + FIXME("no interface for %s\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI MimeAlloc_AddRef( + IMimeAllocator* iface) +{ + return 2; +} + +static ULONG WINAPI MimeAlloc_Release( + IMimeAllocator* iface) +{ + return 1; +} + +static LPVOID WINAPI MimeAlloc_Alloc( + IMimeAllocator* iface, + ULONG cb) +{ + return CoTaskMemAlloc(cb); +} + +static LPVOID WINAPI MimeAlloc_Realloc( + IMimeAllocator* iface, + LPVOID pv, + ULONG cb) +{ + return CoTaskMemRealloc(pv, cb); +} + +static void WINAPI MimeAlloc_Free( + IMimeAllocator* iface, + LPVOID pv) +{ + return CoTaskMemFree(pv); +} + +static ULONG WINAPI MimeAlloc_GetSize( + IMimeAllocator* iface, + LPVOID pv) +{ + FIXME("stub\n"); + return 0; +} + +static int WINAPI MimeAlloc_DidAlloc( + IMimeAllocator* iface, + LPVOID pv) +{ + FIXME("stub\n"); + return 0; +} + +static void WINAPI MimeAlloc_HeapMinimize( + IMimeAllocator* iface) +{ + FIXME("stub\n"); + return; +} + +static HRESULT WINAPI MimeAlloc_FreeParamInfoArray( + IMimeAllocator* iface, + ULONG cParams, + LPMIMEPARAMINFO prgParam, + boolean fFreeArray) +{ + ULONG i; + TRACE("(%p)->(%d, %p, %d)\n", iface, cParams, prgParam, fFreeArray); + + for(i = 0; i < cParams; i++) + { + IMimeAllocator_Free(iface, prgParam[i].pszName); + IMimeAllocator_Free(iface, prgParam[i].pszData); + } + if(fFreeArray) IMimeAllocator_Free(iface, prgParam); + return S_OK; +} + +static HRESULT WINAPI MimeAlloc_FreeAddressList( + IMimeAllocator* iface, + LPADDRESSLIST pList) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeAlloc_FreeAddressProps( + IMimeAllocator* iface, + LPADDRESSPROPS pAddress) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeAlloc_ReleaseObjects( + IMimeAllocator* iface, + ULONG cObjects, + IUnknown **prgpUnknown, + boolean fFreeArray) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + + +static HRESULT WINAPI MimeAlloc_FreeEnumHeaderRowArray( + IMimeAllocator* iface, + ULONG cRows, + LPENUMHEADERROW prgRow, + boolean fFreeArray) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeAlloc_FreeEnumPropertyArray( + IMimeAllocator* iface, + ULONG cProps, + LPENUMPROPERTY prgProp, + boolean fFreeArray) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeAlloc_FreeThumbprint( + IMimeAllocator* iface, + THUMBBLOB *pthumbprint) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + + +static HRESULT WINAPI MimeAlloc_PropVariantClear( + IMimeAllocator* iface, + LPPROPVARIANT pProp) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +static IMimeAllocatorVtbl mime_alloc_vtbl = +{ + MimeAlloc_QueryInterface, + MimeAlloc_AddRef, + MimeAlloc_Release, + MimeAlloc_Alloc, + MimeAlloc_Realloc, + MimeAlloc_Free, + MimeAlloc_GetSize, + MimeAlloc_DidAlloc, + MimeAlloc_HeapMinimize, + MimeAlloc_FreeParamInfoArray, + MimeAlloc_FreeAddressList, + MimeAlloc_FreeAddressProps, + MimeAlloc_ReleaseObjects, + MimeAlloc_FreeEnumHeaderRowArray, + MimeAlloc_FreeEnumPropertyArray, + MimeAlloc_FreeThumbprint, + MimeAlloc_PropVariantClear +}; + +static MimeAllocator mime_allocator = +{ + &mime_alloc_vtbl +}; + +HRESULT MimeAllocator_create(IUnknown *outer, void **obj) +{ + if(outer) return CLASS_E_NOAGGREGATION; + + *obj = &mime_allocator; + return S_OK; +} + +HRESULT WINAPI MimeOleGetAllocator(IMimeAllocator **alloc) +{ + return MimeAllocator_create(NULL, (void**)alloc); +} diff --git a/dlls/inetcomm/regsvr.c b/dlls/inetcomm/regsvr.c index 97759fc..620cfa7 100644 --- a/dlls/inetcomm/regsvr.c +++ b/dlls/inetcomm/regsvr.c @@ -440,6 +440,12 @@ static struct regsvr_coclass const coclass_list[] = { "inetcomm.dll", "Both" }, + { &CLSID_IMimeAllocator, + "CLSID_IMimeAllocator", + NULL, + "inetcomm.dll", + "Both" + }, { &CLSID_IMimeMessage, "CLSID_IMimeMessage", NULL, diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 51135d1..97fe6e6 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -137,11 +137,22 @@ static void test_CreateBody(void) IMimeBody_Release(body); } +static void test_Allocator(void) +{ + HRESULT hr; + IMimeAllocator *alloc; + + hr = MimeOleGetAllocator(&alloc); + ok(hr == S_OK, "ret %08x\n", hr); + IMimeAllocator_Release(alloc); +} + START_TEST(mimeole) { OleInitialize(NULL); test_CreateVirtualStream(); test_CreateSecurity(); test_CreateBody(); + test_Allocator(); OleUninitialize(); }

1 0

Huw Davies : inetcomm: Fix spelling typo.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 2f83e46015300d0647280cae91968f127cf84955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f83e46015300d0647280cae9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 18 11:51:54 2007 +0000 inetcomm: Fix spelling typo. --- dlls/inetcomm/mimeole.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f0185d4..0b5e290 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -396,7 +396,7 @@ static HRESULT parse_headers(MimeBody *body, IStream *stm) return hr; } -static void emptry_param_list(struct list *list) +static void empty_param_list(struct list *list) { param_t *param, *cursor2; @@ -417,7 +417,7 @@ static void empty_header_list(struct list *list) { list_remove(&header->entry); PropVariantClear(&header->value); - emptry_param_list(&header->params); + empty_param_list(&header->params); HeapFree(GetProcessHeap(), 0, header); } }

1 0

Dmitry Timoshkov : gdi32: Add a GdiConvertToDevmodeW test, make it pass under Wine.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: beb2dfec2c074219116fe8c8e5704a9b41a1ddae URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb2dfec2c074219116fe8c8e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Dec 18 20:21:40 2007 +0800 gdi32: Add a GdiConvertToDevmodeW test, make it pass under Wine. --- dlls/gdi32/driver.c | 14 ++++++++---- dlls/gdi32/tests/dc.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8dc14fe..4d1aaad 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -413,8 +413,12 @@ DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA) DEVMODEW *dmW; WORD dmW_size; - dmW_size = dmA->dmSize + CCHDEVICENAME; - if (dmA->dmSize >= (const char *)dmA->dmFormName - (const char *)dmA + CCHFORMNAME) + dmW_size = dmA->dmSize; + if (dmW_size > sizeof(DEVMODEA)) + dmW_size = sizeof(DEVMODEA); + + dmW_size += CCHDEVICENAME; + if (dmA->dmSize >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) dmW_size += CCHFORMNAME; dmW = HeapAlloc(GetProcessHeap(), 0, dmW_size + dmA->dmDriverExtra); @@ -425,12 +429,12 @@ DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA) /* copy slightly more, to avoid long computations */ memcpy(&dmW->dmSpecVersion, &dmA->dmSpecVersion, dmA->dmSize - CCHDEVICENAME); - if (dmA->dmSize >= (const char *)dmA->dmFormName - (const char *)dmA + CCHFORMNAME) + if (dmA->dmSize >= FIELD_OFFSET(DEVMODEA, dmFormName) + CCHFORMNAME) { MultiByteToWideChar(CP_ACP, 0, (const char*) dmA->dmFormName, CCHFORMNAME, dmW->dmFormName, CCHFORMNAME); - if (dmA->dmSize > (const char *)&dmA->dmLogPixels - (const char *)dmA) - memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA->dmSize - ((const char *)&dmA->dmLogPixels - (const char *)dmA)); + if (dmA->dmSize > FIELD_OFFSET(DEVMODEA, dmLogPixels)) + memcpy(&dmW->dmLogPixels, &dmA->dmLogPixels, dmA->dmSize - FIELD_OFFSET(DEVMODEA, dmLogPixels)); } if (dmA->dmDriverExtra) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 72cd155..f292c37 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -173,8 +173,58 @@ static void test_savedc(void) DeleteDC(hdc); } +static void test_GdiConvertToDevmodeW(void) +{ + DEVMODEW * (WINAPI *pGdiConvertToDevmodeW)(const DEVMODEA *); + DEVMODEA dmA; + DEVMODEW *dmW; + BOOL ret; + + pGdiConvertToDevmodeW = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GdiConvertToDevmodeW"); + if (!pGdiConvertToDevmodeW) + { + skip("GdiConvertToDevmodeW is not available on this platform\n"); + return; + } + + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA); + ok(ret, "EnumDisplaySettingsExA error %u\n", GetLastError()); + ok(dmA.dmSize >= FIELD_OFFSET(DEVMODEA, dmICMMethod), "dmSize is too small: %04x\n", dmA.dmSize); + ok(dmA.dmSize <= sizeof(DEVMODEA), "dmSize is too large: %04x\n", dmA.dmSize); + + dmW = pGdiConvertToDevmodeW(&dmA); + ok(dmW->dmSize >= FIELD_OFFSET(DEVMODEW, dmICMMethod), "dmSize is too small: %04x\n", dmW->dmSize); + ok(dmW->dmSize <= sizeof(DEVMODEW), "dmSize is too large: %04x\n", dmW->dmSize); + HeapFree(GetProcessHeap(), 0, dmW); + + dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmFields) + sizeof(dmA.dmFields); + dmW = pGdiConvertToDevmodeW(&dmA); + ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dmW->dmFields), + "expected %04x, got %04x\n", + FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dmW->dmFields), dmW->dmSize); + HeapFree(GetProcessHeap(), 0, dmW); + + dmA.dmICMMethod = DMICMMETHOD_NONE; + dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmICMMethod) + sizeof(dmA.dmICMMethod); + dmW = pGdiConvertToDevmodeW(&dmA); + ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmICMMethod) + sizeof(dmW->dmICMMethod), + "expected %04x, got %04x\n", + FIELD_OFFSET(DEVMODEW, dmICMMethod) + sizeof(dmW->dmICMMethod), dmW->dmSize); + ok(dmW->dmICMMethod == DMICMMETHOD_NONE, + "expected DMICMMETHOD_NONE, got %u\n", dmW->dmICMMethod); + HeapFree(GetProcessHeap(), 0, dmW); + + dmA.dmSize = 1024; + dmW = pGdiConvertToDevmodeW(&dmA); + ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmPanningHeight) + sizeof(dmW->dmPanningHeight), + "expected %04x, got %04x\n", + FIELD_OFFSET(DEVMODEW, dmPanningHeight) + sizeof(dmW->dmPanningHeight), dmW->dmSize); + HeapFree(GetProcessHeap(), 0, dmW); +} + START_TEST(dc) { test_savedc(); test_savedc_2(); + test_GdiConvertToDevmodeW(); }

1 0

Kirill K. Smirnov : server: Properly notify renderer while activating another screen buffer.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 6e76cc7622d9708a1e7431d2e4a411750084d9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e76cc7622d9708a1e7431d2e… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Tue Dec 18 03:03:11 2007 +0300 server: Properly notify renderer while activating another screen buffer. --- server/console.c | 74 ++++++++++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 35 deletions(-) diff --git a/server/console.c b/server/console.c index a5020ac..b931e05 100644 --- a/server/console.c +++ b/server/console.c @@ -302,6 +302,43 @@ static struct object *create_console_input( struct thread* renderer ) return &console_input->obj; } +static void generate_sb_initial_events( struct console_input *console_input ) +{ + struct screen_buffer *screen_buffer = console_input->active; + struct console_renderer_event evt; + + evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); + console_input_events_append( console_input->evt, &evt ); + + evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT; + evt.u.resize.width = screen_buffer->width; + evt.u.resize.height = screen_buffer->height; + console_input_events_append( console_input->evt, &evt ); + + evt.event = CONSOLE_RENDERER_DISPLAY_EVENT; + evt.u.display.left = screen_buffer->win.left; + evt.u.display.top = screen_buffer->win.top; + evt.u.display.width = screen_buffer->win.right - screen_buffer->win.left + 1; + evt.u.display.height = screen_buffer->win.bottom - screen_buffer->win.top + 1; + console_input_events_append( console_input->evt, &evt ); + + evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + evt.u.update.top = 0; + evt.u.update.bottom = screen_buffer->height - 1; + console_input_events_append( console_input->evt, &evt ); + + evt.event = CONSOLE_RENDERER_CURSOR_GEOM_EVENT; + evt.u.cursor_geom.size = screen_buffer->cursor_size; + evt.u.cursor_geom.visible = screen_buffer->cursor_visible; + console_input_events_append( console_input->evt, &evt ); + + evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT; + evt.u.cursor_pos.x = screen_buffer->cursor_x; + evt.u.cursor_pos.y = screen_buffer->cursor_y; + console_input_events_append( console_input->evt, &evt ); +} + static struct screen_buffer *create_console_output( struct console_input *console_input ) { struct screen_buffer *screen_buffer; @@ -341,40 +378,8 @@ static struct screen_buffer *create_console_output( struct console_input *consol if (!console_input->active) { - struct console_renderer_event evt; console_input->active = (struct screen_buffer*)grab_object( screen_buffer ); - - /* generate the initial events */ - evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT; - memset(&evt.u, 0, sizeof(evt.u)); - console_input_events_append( console_input->evt, &evt ); - - evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT; - evt.u.resize.width = screen_buffer->width; - evt.u.resize.height = screen_buffer->height; - console_input_events_append( console_input->evt, &evt ); - - evt.event = CONSOLE_RENDERER_DISPLAY_EVENT; - evt.u.display.left = screen_buffer->win.left; - evt.u.display.top = screen_buffer->win.top; - evt.u.display.width = screen_buffer->win.right - screen_buffer->win.left + 1; - evt.u.display.height = screen_buffer->win.bottom - screen_buffer->win.top + 1; - console_input_events_append( console_input->evt, &evt ); - - evt.event = CONSOLE_RENDERER_UPDATE_EVENT; - evt.u.update.top = 0; - evt.u.update.bottom = screen_buffer->height - 1; - console_input_events_append( console_input->evt, &evt ); - - evt.event = CONSOLE_RENDERER_CURSOR_GEOM_EVENT; - evt.u.cursor_geom.size = screen_buffer->cursor_size; - evt.u.cursor_geom.visible = screen_buffer->cursor_visible; - console_input_events_append( console_input->evt, &evt ); - - evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT; - evt.u.cursor_pos.x = screen_buffer->cursor_x; - evt.u.cursor_pos.y = screen_buffer->cursor_y; - console_input_events_append( console_input->evt, &evt ); + generate_sb_initial_events( console_input ); } return screen_buffer; } @@ -665,8 +670,7 @@ static int set_console_input_info( const struct set_console_input_info_request * { if (console->active) release_object( console->active ); console->active = screen_buffer; - evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT; - console_input_events_append( console->evt, &evt ); + generate_sb_initial_events( console ); } else release_object( screen_buffer );

1 0

Huw Davies : include: Add IMimeAllocator.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: cbf096329cd5132859f03987182e23858fbf96fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf096329cd5132859f039871… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 14 12:33:24 2007 +0000 include: Add IMimeAllocator. --- include/mimeole.idl | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 0f21c1c..171f0e9 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -30,6 +30,7 @@ interface IMimeBody; interface IMimeEnumProperties; cpp_quote("DEFINE_GUID(CLSID_IMimeBody, 0xfd853cdb, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") +cpp_quote("DEFINE_GUID(CLSID_IMimeAllocator, 0xfd853cdd, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("DEFINE_GUID(CLSID_IMimeMessage, 0xfd853ce3, 0x7f86, 0x11d0, 0x82, 0x52, 0x0, 0xc0, 0x4f, 0xd8, 0x5a, 0xb4);") cpp_quote("#define MIME_E_REG_CREATE_KEY 0x800cce01") @@ -1017,6 +1018,15 @@ cpp_quote("#endif") ] interface IMimeEnumHeaderRows : IUnknown { + typedef struct tagENUMHEADERROW + { + HHEADERROW hRow; + LPSTR pszHeader; + LPSTR pszData; + ULONG cchData; + DWORD_PTR dwReserved; + } ENUMHEADERROW, *LPENUMHEADERROW; + /* FIXME: fill this in */ } @@ -1026,6 +1036,13 @@ cpp_quote("#endif") ] interface IMimeEnumProperties : IUnknown { + typedef struct tagENUMPROPERTY + { + LPSTR pszName; + HHEADERROW hRow; + DWORD dwPropId; + } ENUMPROPERTY, *LPENUMPROPERTY; + /* FIXME: fill this in */ } @@ -1062,7 +1079,40 @@ cpp_quote("#endif") ] interface IMimeAllocator : IMalloc { - /* FIXME: fill this in */ + typedef [unique] IMimeAllocator *LPMIMEALLOCATOR; + + HRESULT FreeParamInfoArray( + [in] ULONG cParams, + [in] LPMIMEPARAMINFO prgParam, + [in] boolean fFreeArray); + + HRESULT FreeAddressList( + [in,out] LPADDRESSLIST pList); + + HRESULT FreeAddressProps( + [in,out] LPADDRESSPROPS pAddress); + + HRESULT ReleaseObjects( + [in] ULONG cObjects, + [in] IUnknown **prgpUnknown, + [in] boolean fFreeArray); + + HRESULT FreeEnumHeaderRowArray( + [in] ULONG cRows, + [in] LPENUMHEADERROW prgRow, + [in] boolean fFreeArray); + + HRESULT FreeEnumPropertyArray( + [in] ULONG cProps, + [in] LPENUMPROPERTY prgProp, + [in] boolean fFreeArray); + + HRESULT FreeThumbprint( + [in] THUMBBLOB *pthumbprint); + + HRESULT PropVariantClear( + [in] LPPROPVARIANT pProp); + } [

1 0

Stefan Dösinger : wined3d: Filter out some shader compilation spam.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 88f746ab0e7a10d33f67b36744dfb6d8b8281748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f746ab0e7a10d33f67b3674… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 15 11:43:51 2007 +0100 wined3d: Filter out some shader compilation spam. --- dlls/wined3d/glsl_shader.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c4f6e5..42454c3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -56,6 +56,14 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { int infologLength = 0; char *infoLog; + int i; + BOOL is_spam; + + const char *spam[] = { + "Vertex shader was successfully compiled to run on hardware.\n", /* fglrx */ + "Fragment shader was successfully compiled to run on hardware.\n", /* fglrx */ + "Fragment shader(s) linked, vertex shader(s) linked." /* fglrx, no \n */ + }; GL_EXTCALL(glGetObjectParameterivARB(obj, GL_OBJECT_INFO_LOG_LENGTH_ARB, @@ -67,7 +75,19 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { { infoLog = HeapAlloc(GetProcessHeap(), 0, infologLength); GL_EXTCALL(glGetInfoLogARB(obj, infologLength, NULL, infoLog)); - FIXME("Error received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); + is_spam = FALSE; + + for(i = 0; i < sizeof(spam) / sizeof(spam[0]); i++) { + if(strcmp(infoLog, spam[i]) == 0) { + is_spam = TRUE; + break; + } + } + if(is_spam) { + TRACE("Spam received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); + } else { + FIXME("Error received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); + } HeapFree(GetProcessHeap(), 0, infoLog); } }

1 0

Stefan Dösinger : kernel32: Add a test for BindIoCompletionCallback.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 70868dfa610320074d513c06c82442c7e9ba189a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70868dfa610320074d513c06c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 17 18:16:49 2007 +0100 kernel32: Add a test for BindIoCompletionCallback. --- dlls/kernel32/tests/sync.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 616404e..e402fed 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -282,10 +282,118 @@ static void test_event_security(void) CloseHandle(handle); } +static HANDLE sem = 0; + +static void CALLBACK iocp_callback(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped) +{ + ReleaseSemaphore(sem, 1, NULL); +} + +static BOOL WINAPI (*p_BindIoCompletionCallback)( HANDLE FileHandle, LPOVERLAPPED_COMPLETION_ROUTINE Function, ULONG Flags) = NULL; + +static void test_iocp_callback(void) +{ + char temp_path[MAX_PATH]; + char filename[MAX_PATH]; + DWORD ret; + BOOL retb; + static const char prefix[] = "pfx"; + HANDLE hFile; + HMODULE hmod = GetModuleHandleA("kernel32.dll"); + DWORD bytesWritten; + const char *buffer = "12345678123456781234567812345678"; + OVERLAPPED overlapped; + + p_BindIoCompletionCallback = (void*)GetProcAddress(hmod, "BindIoCompletionCallback"); + if(!p_BindIoCompletionCallback) { + skip("BindIoCompletionCallback not found in this DLL\n"); + return; + } + + sem = CreateSemaphore(NULL, 0, 1, NULL); + ok(sem != INVALID_HANDLE_VALUE, "Creating a semaphore failed\n"); + + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathA error %d\n", GetLastError()); + ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); + + ret = GetTempFileNameA(temp_path, prefix, 0, filename); + ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); + + hFile = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS, 0); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError()); + + retb = p_BindIoCompletionCallback(hFile, iocp_callback, 0); + ok(retb == FALSE, "BindIoCompletionCallback succeeded on a file that wasn't created with FILE_FLAG_OVERLAPPED\n"); + if(retb == FALSE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { + todo_wine ok (0, "BindIoCompletionCallback returned ERROR_CALL_NOT_IMPLEMENTED\n"); + return; + } + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error is %d\n", GetLastError()); + + ret = CloseHandle(hFile); + ok( ret, "CloseHandle: error %d\n", GetLastError()); + ret = DeleteFileA(filename); + ok( ret, "DeleteFileA: error %d\n", GetLastError()); + + hFile = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_OVERLAPPED, 0); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError()); + + retb = p_BindIoCompletionCallback(hFile, iocp_callback, 0); + ok(retb == TRUE, "BindIoCompletionCallback failed\n"); + + memset(&overlapped, 0, sizeof(overlapped)); + retb = WriteFile(hFile, (const void *) buffer, 4, &bytesWritten, &overlapped); + ok(retb == TRUE || GetLastError() == ERROR_IO_PENDING, "WriteFile failed, lastError = %d\n", GetLastError()); + + ret = WaitForSingleObject(sem, 5000); + ok(ret == WAIT_OBJECT_0, "Wait for the IO completion callback failed\n"); + CloseHandle(sem); + + retb = p_BindIoCompletionCallback(hFile, iocp_callback, 0); + ok(retb == FALSE, "BindIoCompletionCallback succeeded when setting the same callback on the file again\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error is %d\n", GetLastError()); + retb = p_BindIoCompletionCallback(hFile, NULL, 0); + ok(retb == FALSE, "BindIoCompletionCallback succeeded when setting the callback to NULL\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error is %d\n", GetLastError()); + + ret = CloseHandle(hFile); + ok( ret, "CloseHandle: error %d\n", GetLastError()); + ret = DeleteFileA(filename); + ok( ret, "DeleteFileA: error %d\n", GetLastError()); + + hFile = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_OVERLAPPED, 0); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError()); + retb = p_BindIoCompletionCallback(hFile, NULL, 0); + ok(retb == TRUE, "BindIoCompletionCallback failed with a NULL callback(first time set)\n"); + ret = CloseHandle(hFile); + ok( ret, "CloseHandle: error %d\n", GetLastError()); + ret = DeleteFileA(filename); + ok( ret, "DeleteFileA: error %d\n", GetLastError()); + + hFile = CreateFileA(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_FLAG_RANDOM_ACCESS | FILE_FLAG_OVERLAPPED, 0); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA: error %d\n", GetLastError()); + retb = p_BindIoCompletionCallback(hFile, iocp_callback, 12345); + ok(retb == TRUE, "BindIoCompletionCallback failed with Flags != 0\n"); + ret = CloseHandle(hFile); + ok( ret, "CloseHandle: error %d\n", GetLastError()); + ret = DeleteFileA(filename); + ok( ret, "DeleteFileA: error %d\n", GetLastError()); + + retb = p_BindIoCompletionCallback(NULL, iocp_callback, 0); + ok(retb == FALSE, "BindIoCompletionCallback succeeded on a NULL file\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Last error is %d\n", GetLastError()); +} + START_TEST(sync) { test_signalandwait(); test_mutex(); test_slist(); test_event_security(); + test_iocp_callback(); }

1 0

Stefan Dösinger : wined3d: Disable the SWAPEFFECT_DISCARD clear.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: cd858dfa220b05d0233010ea08772a12b4ff591e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd858dfa220b05d0233010ea0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 13 22:13:39 2007 +0100 wined3d: Disable the SWAPEFFECT_DISCARD clear. --- dlls/wined3d/swapchain.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 28fd54b..187c0c4 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -274,8 +274,24 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO } #endif - if (This->presentParms.SwapEffect == WINED3DSWAPEFFECT_DISCARD) { - TRACE("Clearing the color buffer with pink color\n"); + /* This is disabled, but the code left in for debug purposes. + * + * Since we're allowed to modify the new back buffer on a D3DSWAPEFFECT_DISCARD flip, + * we can clear it with some ugly color to make bad drawing visible and ease debugging. + * The Debug runtime does the same on Windows. However, a few games do not redraw the + * screen properly, like Max Payne 2, which leaves a few pixels undefined. + * + * Tests show that the content of the back buffer after a discard flip is indeed not + * reliable, so no game can depend on the exact content. However, it resembles the + * old contents in some way, for example by showing fragments at other locations. In + * general, the color theme is still intact. So Max payne, which draws rather dark scenes + * gets a dark background image. If we clear it with a bright ugly color, the game's + * bug shows up much more than it does on Windows, and the players see single pixels + * with wrong colors. + * (The Max Payne bug has been confirmed on Windows with the debug runtime) + */ + if (FALSE && This->presentParms.SwapEffect == WINED3DSWAPEFFECT_DISCARD) { + TRACE("Clearing the color buffer with cyan color\n"); IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, WINED3DCLEAR_TARGET, 0xff00ffff, 1.0, 0);

1 0

Stefan Dösinger : wined3d: Correct a pixel shader version comparison.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 8e036d6487c8b1e499e314cc3bc74dbbe8d16cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e036d6487c8b1e499e314cc3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 14 22:09:07 2007 +0100 wined3d: Correct a pixel shader version comparison. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 46ca6aa..0c4f6e5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -612,7 +612,7 @@ void shader_generate_glsl_declarations( /* Declare input register varyings. Only pixel shader, vertex shaders have that declared in the * helper function shader that is linked in at link time */ - if(pshader && This->baseShader.hex_version >= WINED3DVS_VERSION(3, 0)) { + if(pshader && This->baseShader.hex_version >= WINED3DPS_VERSION(3, 0)) { if(use_vs(device)) { shader_addline(buffer, "varying vec4 IN[%u];\n", GL_LIMITS(glsl_varyings) / 4); } else {

1 0

Stefan Dösinger : wined3d: Ignore tesselated and unused streams when comparing attribs.
by Alexandre Julliard 18 Dec '07

18 Dec '07

Module: wine Branch: master Commit: 2eab3d5c112597ac2b399c0234d4282987864294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eab3d5c112597ac2b399c023… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 15 11:40:19 2007 +0100 wined3d: Ignore tesselated and unused streams when comparing attribs. --- dlls/wined3d/vertexshader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 13349de..e50bf8f 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -691,6 +691,10 @@ static inline BOOL swizzled_attribs_differ(IWineD3DVertexShaderImpl *This, IWine DWORD usage_idx; for(i = 0; i < vdecl->declarationWNumElements; i++) { + /* Ignore tesselated streams and the termination entry(position0, stream 255, unused) */ + if(vdecl->pDeclarationWine[i].Stream >= MAX_STREAMS || + vdecl->pDeclarationWine[i].Type == WINED3DDECLTYPE_UNUSED) continue; + for(j = 0; j < MAX_ATTRIBS; j++) { if(!This->baseShader.reg_maps.attributes[j]) continue;

1 0