August 2007 - Wine-commits - list.winehq.org

Evan Stade : gdiplus: Added GdipImageGetFrameDimensionsList stub.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: f3879cd97fd95a3a571f9c98c75450ab436e2fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3879cd97fd95a3a571f9c98c… Author: Evan Stade <estade(a)gmail.com> Date: Fri Aug 3 17:30:26 2007 -0700 gdiplus: Added GdipImageGetFrameDimensionsList stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 14 ++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 538c571..3d79760 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -408,7 +408,7 @@ @ stub GdipImageForceValidation @ stdcall GdipImageGetFrameCount(ptr ptr ptr) @ stub GdipImageGetFrameDimensionsCount -@ stub GdipImageGetFrameDimensionsList +@ stdcall GdipImageGetFrameDimensionsList(ptr ptr long) @ stub GdipImageRotateFlip @ stub GdipImageSelectActiveFrame @ stub GdipImageSetAbort diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 391a5fc..6b71014 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -362,6 +362,20 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, return NotImplemented; } +GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage* image, + GUID* dimensionIDs, UINT count) +{ + static int calls; + + if(!image || !dimensionIDs) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return Ok; +} + GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) { if(!stream || !image) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f735f94..7e94a68 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -179,6 +179,7 @@ GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader*); GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage*,PROPID,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); +GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT); GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream*,GpImage**); GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage*,PROPID);

1 0

Evan Stade : gdiplus: Added GdipCreateBitmapFromStream.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 8128aeb035ddfa769df99b08ca551eafcc5c007a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8128aeb035ddfa769df99b08c… Author: Evan Stade <estade(a)gmail.com> Date: Fri Aug 3 17:30:22 2007 -0700 gdiplus: Added GdipCreateBitmapFromStream. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/image.c | 29 ++++++++++++++++++++++++++--- include/gdiplusflat.h | 2 ++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index db227c1..538c571 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -79,7 +79,7 @@ @ stub GdipCreateBitmapFromHICON @ stub GdipCreateBitmapFromResource @ stdcall GdipCreateBitmapFromScan0(long long long long ptr ptr) -@ stub GdipCreateBitmapFromStream +@ stdcall GdipCreateBitmapFromStream(ptr ptr) @ stdcall GdipCreateBitmapFromStreamICM(ptr ptr) @ stub GdipCreateCachedBitmap @ stdcall GdipCreateCustomLineCap(ptr ptr long long ptr) @@ -437,7 +437,7 @@ @ stub GdipIsVisibleRegionRectI @ stub GdipLoadImageFromFile @ stub GdipLoadImageFromFileICM -@ stub GdipLoadImageFromStream +@ stdcall GdipLoadImageFromStream(ptr ptr) @ stdcall GdipLoadImageFromStreamICM(ptr ptr) @ stub GdipMeasureCharacterRanges @ stub GdipMeasureDriverString diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d649e03..391a5fc 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -149,6 +149,24 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, return Ok; } +GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream, + GpBitmap **bitmap) +{ + GpStatus stat; + + stat = GdipLoadImageFromStream(stream, (GpImage**) bitmap); + + if(stat != Ok) + return stat; + + /* FIXME: make sure it's actually a bitmap */ + (*bitmap)->image.type = ImageTypeBitmap; + (*bitmap)->width = ipicture_pixel_width((*bitmap)->image.picture); + (*bitmap)->height = ipicture_pixel_height((*bitmap)->image.picture); + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream* stream, GpBitmap **bitmap) { @@ -344,8 +362,7 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, return NotImplemented; } -/* FIXME: no ICM */ -GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream* stream, GpImage **image) +GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) { if(!stream || !image) return InvalidParameter; @@ -360,12 +377,18 @@ GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream* stream, GpImage **image) return GenericError; } - /* FIXME: use IPicture_get_Type to get image type */ + /* FIXME: use IPicture_get_Type to get image type? */ (*image)->type = ImageTypeUnknown; return Ok; } +/* FIXME: no ICM */ +GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream* stream, GpImage **image) +{ + return GdipLoadImageFromStream(stream, image); +} + GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage *image, PROPID propId) { static int calls; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index fb15b88..f735f94 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -166,6 +166,7 @@ GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*, GpBitmap**); +GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromStreamICM(IStream*,GpBitmap**); GpStatus WINGDIPAPI GdipDisposeImage(GpImage*); GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*); @@ -178,6 +179,7 @@ GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader*); GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage*,PROPID,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); +GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream*,GpImage**); GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage*,PROPID); GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*,

1 0

Alexandre Julliard : gdiplus: Fixed GdiplusStartupOutput definition.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 42f730ddf5bef519930b25e3e8e7e04639b7c6ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f730ddf5bef519930b25e3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 6 12:21:52 2007 +0200 gdiplus: Fixed GdiplusStartupOutput definition. --- include/gdiplusinit.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/gdiplusinit.h b/include/gdiplusinit.h index fd7e9e5..22155b7 100644 --- a/include/gdiplusinit.h +++ b/include/gdiplusinit.h @@ -26,6 +26,8 @@ enum DebugEventLevel }; typedef VOID (WINAPI *DebugEventProc)(enum DebugEventLevel, CHAR *); +typedef Status (WINAPI *NotificationHookProc)(ULONG_PTR *); +typedef void (WINAPI *NotificationUnhookProc)(ULONG_PTR); struct GdiplusStartupInput { @@ -49,8 +51,8 @@ struct GdiplusStartupInput struct GdiplusStartupOutput { - ULONG_PTR NotificationHook; - ULONG_PTR NotificationUnhook; + NotificationHookProc NotificationHook; + NotificationUnhookProc NotificationUnhook; }; #ifdef __cplusplus

1 0

Evan Stade : gdiplus: Allow non-default GdiplusStartupInput.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 81c0865bee71f0da14445e139ae7c8c3f868f6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c0865bee71f0da14445e139… Author: Evan Stade <estade(a)gmail.com> Date: Fri Aug 3 17:30:17 2007 -0700 gdiplus: Allow non-default GdiplusStartupInput. --- dlls/gdiplus/gdiplus.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 9267b90..3787836 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -32,6 +32,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +static Status WINAPI NotificationHook(ULONG_PTR *token) +{ + TRACE("%p\n", token); + if(!token) + return InvalidParameter; + + return Ok; +} + +static void WINAPI NotificationUnhook(ULONG_PTR token) +{ + TRACE("%ld\n", token); +} + /***************************************************** * DllMain */ @@ -57,20 +71,27 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) Status WINAPI GdiplusStartup(ULONG_PTR *token, const struct GdiplusStartupInput *input, struct GdiplusStartupOutput *output) { - if(!token) + if(!token || !input) return InvalidParameter; - if(input->GdiplusVersion != 1) { + TRACE("%p %p %p\n", token, input, output); + TRACE("GdiplusStartupInput %d %p %d %d\n", input->GdiplusVersion, + input->DebugEventCallback, input->SuppressBackgroundThread, + input->SuppressExternalCodecs); + + if(input->GdiplusVersion != 1) return UnsupportedGdiplusVersion; - } else if ((input->DebugEventCallback) || - (input->SuppressBackgroundThread) || (input->SuppressExternalCodecs)){ - FIXME("Unimplemented for non-default GdiplusStartupInput\n"); - return NotImplemented; - } else if(output) { - FIXME("Unimplemented for non-null GdiplusStartupOutput\n"); - return NotImplemented; + + if(input->SuppressBackgroundThread){ + if(!output) + return InvalidParameter; + + output->NotificationHook = NotificationHook; + output->NotificationUnhook = NotificationUnhook; } + /* FIXME: DebugEventCallback ignored */ + return Ok; }

1 0

Michael Stefaniuc : mshtml: Remove const in front of REFIID as that is a macro that already starts with const .
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: ad020e145e88cede1345ae7dba64ef68b207ee33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad020e145e88cede1345ae7db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Aug 4 01:02:04 2007 +0200 mshtml: Remove const in front of REFIID as that is a macro that already starts with const. --- dlls/mshtml/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 9a2a4f0..6ed2549 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -54,7 +54,7 @@ static HINSTANCE shdoclc = NULL; static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; -static const REFIID tid_ids[] = { +static REFIID tid_ids[] = { &IID_IHTMLWindow2 };

1 0

James Hawkins : msi: Fix the size allocated for the deferred custom action string.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: f1b790be0663790ca9d467737aba2c005306e6ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b790be0663790ca9d467737… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Aug 3 17:10:30 2007 -0700 msi: Fix the size allocated for the deferred custom action string. --- dlls/msi/custom.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 390113e..a44b918 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -153,7 +153,8 @@ static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata, return strdupW(action); len = lstrlenW(action) + lstrlenW(actiondata) + - lstrlenW(usersid) + lstrlenW(prodcode) + 5; + lstrlenW(usersid) + lstrlenW(prodcode) + + lstrlenW(format) - 7; deferred = msi_alloc(len * sizeof(WCHAR)); sprintfW(deferred, format, actiondata, usersid, prodcode, action);

1 0

Evan Stade : oleaut32: Allow PNG_COLOR_TYPE_RGB_ALPHA.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 72a760beb0595555959e0e45f4a0854dd53869a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a760beb0595555959e0e45f… Author: Evan Stade <estade(a)gmail.com> Date: Fri Aug 3 17:30:11 2007 -0700 oleaut32: Allow PNG_COLOR_TYPE_RGB_ALPHA. --- dlls/oleaut32/olepicture.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index ca46d01..b12a85b 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1443,7 +1443,8 @@ static HRESULT OLEPictureImpl_LoadPNG(OLEPictureImpl *This, BYTE *xbuf, ULONG xr ppng_read_info(png_ptr, info_ptr); if(!(png_ptr->color_type == PNG_COLOR_TYPE_RGB || - png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)){ + png_ptr->color_type == PNG_COLOR_TYPE_PALETTE || + png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)){ FIXME("Unsupported .PNG type: %d\n", png_ptr->color_type); ret = E_FAIL; goto pngend;

1 0

Michael Stefaniuc : dsound: Remove redundant NULL check before HeapFree. Found by Smatch.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: efe4573bc8b816e95c642e89b4d40427c26be224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe4573bc8b816e95c642e89b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Aug 4 00:57:05 2007 +0200 dsound: Remove redundant NULL check before HeapFree. Found by Smatch. --- dlls/dsound/primary.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 557422a..355fc2c 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -253,10 +253,8 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) if (IDsDriverBuffer_Release(device->hwbuf) == 0) device->hwbuf = 0; } - } else { - if (device->pwave) - HeapFree(GetProcessHeap(),0,device->pwave); - } + } else + HeapFree(GetProcessHeap(),0,device->pwave); HeapFree(GetProcessHeap(),0,device->pwfx); device->pwfx=NULL;

1 0

Michael Stefaniuc : inkobj: Remove break after return. Found by Smatch.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 66d27c2b08c0c6b79018c07442fbfc82504359ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d27c2b08c0c6b79018c0744… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Aug 4 00:56:38 2007 +0200 inkobj: Remove break after return. Found by Smatch. --- dlls/inkobj/inkobj.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/inkobj/inkobj.c b/dlls/inkobj/inkobj.c index 517b6a7..d1cae73 100644 --- a/dlls/inkobj/inkobj.c +++ b/dlls/inkobj/inkobj.c @@ -38,7 +38,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ - break; case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); INKOBJ_hInstance = hinst;

1 0

Michael Stefaniuc : winex11.drv: Move the TRACE before the return. Found by Smatch.
by Alexandre Julliard 06 Aug '07

06 Aug '07

Module: wine Branch: master Commit: 0bd2548bbf2edebf963d06d88b0de26650e7f361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd2548bbf2edebf963d06d88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Aug 4 00:56:50 2007 +0200 winex11.drv: Move the TRACE before the return. Found by Smatch. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 806f7e9..91acd3b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1259,8 +1259,8 @@ int X11DRV_GetPixelFormat(X11DRV_PDEVICE *physDev) { return 1; } - return physDev->current_pf; TRACE("(%p): returns %d\n", physDev, physDev->current_pf); + return physDev->current_pf; } /**

1 0