wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

Paul Vriens : crypt32/tests: Don't crash on Vista.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 961d65ab30963e47120ee5a1178430b678a270c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961d65ab30963e47120ee5a11… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Sep 5 13:27:41 2008 +0200 crypt32/tests: Don't crash on Vista. --- dlls/crypt32/tests/chain.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 5bae989..ccb4cfc 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1579,9 +1579,13 @@ static void testGetCertChain(void) DWORD i; /* Basic parameter checks */ - ret = pCertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); + if (0) + { + /* Crash on Vista */ + ret = pCertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + } ret = pCertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, &chain); ok(!ret && GetLastError() == E_INVALIDARG, @@ -1593,9 +1597,13 @@ static void testGetCertChain(void) */ cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); - ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); + if (0) + { + /* Crash on Vista */ + ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + } /* Crash ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, NULL); */

1 0

Nikolay Sivov : gdiplus: Implemented GdipCloneImage.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: b6c52ce9969ebc86f9f23534cbff5f0ecd7741ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c52ce9969ebc86f9f23534c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 5 14:41:49 2008 +0400 gdiplus: Implemented GdipCloneImage. --- dlls/gdiplus/image.c | 45 +++++++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/image.c | 9 ++----- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 197665d..bcdc64f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -242,11 +242,50 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) { - if (!(image && cloneImage)) return InvalidParameter; + IStream* stream; + HRESULT hr; + INT size; - FIXME("stub: %p, %p\n", image, cloneImage); + TRACE("%p, %p\n", image, cloneImage); - return NotImplemented; + if (!image || !cloneImage) + return InvalidParameter; + + hr = CreateStreamOnHGlobal(0, TRUE, &stream); + if (FAILED(hr)) + return GenericError; + + *cloneImage = GdipAlloc(sizeof(GpImage)); + if (!*cloneImage) + { + IStream_Release(stream); + return OutOfMemory; + } + (*cloneImage)->type = image->type; + (*cloneImage)->flags = image->flags; + + hr = IPicture_SaveAsFile(image->picture, stream, FALSE, &size); + if(FAILED(hr)) + { + WARN("Failed to save image on stream\n"); + goto out; + } + + hr = OleLoadPicture(stream, size, FALSE, &IID_IPicture, + (LPVOID*) &(*cloneImage)->picture); + if (FAILED(hr)) + { + WARN("Failed to load image from stream\n"); + goto out; + } + + IStream_Release(stream); + return Ok; +out: + IStream_Release(stream); + GdipFree(*cloneImage); + *cloneImage = NULL; + return GenericError; } GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 49d1e5e..46e63f2 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -504,22 +504,19 @@ static void test_GdipCloneImage(void) /* Create an image, clone it, delete the original, make sure the copy works */ stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); expect(Ok, stat); -todo_wine -{ + image_src = ((GpImage*)bm); stat = GdipCloneImage(image_src, &image_dest); expect(Ok, stat); -} + stat = GdipDisposeImage((GpImage*)bm); expect(Ok, stat); -todo_wine -{ stat = GdipGetImageBounds(image_dest, &rectF, &unit); expect(Ok, stat); + stat = GdipDisposeImage(image_dest); expect(Ok, stat); } -} START_TEST(image) {

1 0

Nikolay Sivov : gdiplus: Implemented GdipGraphicsClear.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: bff1678f5495c8fc2c2d05202ad007f576df5904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff1678f5495c8fc2c2d05202… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 5 13:56:10 2008 +0400 gdiplus: Implemented GdipGraphicsClear. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 35 +++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/graphics.c | 11 +++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e25ceb7..f7b1d5d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -403,7 +403,7 @@ @ stub GdipGetVisibleClipBounds @ stub GdipGetVisibleClipBoundsI @ stdcall GdipGetWorldTransform(ptr ptr) -@ stub GdipGraphicsClear +@ stdcall GdipGraphicsClear(ptr long) @ stub GdipGraphicsSetAbort @ stub GdipImageForceValidation @ stdcall GdipImageGetFrameCount(ptr ptr ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1265bd7..b6cf090 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2538,6 +2538,41 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics *graphics, GpMatrix *matrix return Ok; } +GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics *graphics, ARGB color) +{ + GpSolidFill *brush; + GpStatus stat; + RECT rect; + + TRACE("(%p, %x)\n", graphics, color); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + if((stat = GdipCreateSolidFill(color, &brush)) != Ok) + return stat; + + if(graphics->hwnd){ + if(!GetWindowRect(graphics->hwnd, &rect)){ + GdipDeleteBrush((GpBrush*)brush); + return GenericError; + } + + GdipFillRectangle(graphics, (GpBrush*)brush, 0.0, 0.0, (REAL)(rect.right - rect.left), + (REAL)(rect.bottom - rect.top)); + } + else + GdipFillRectangle(graphics, (GpBrush*)brush, 0.0, 0.0, (REAL)GetDeviceCaps(graphics->hdc, HORZRES), + (REAL)GetDeviceCaps(graphics->hdc, VERTRES)); + + GdipDeleteBrush((GpBrush*)brush); + + return Ok; +} + GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics *graphics, BOOL *res) { TRACE("(%p, %p)\n", graphics, res); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d83f3b7..a011b91 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -672,6 +672,8 @@ static void test_Get_Release_DC(void) expect(ObjectBusy, status); status = Ok; status = GdipGetWorldTransform(graphics, m); expect(ObjectBusy, status); status = Ok; + status = GdipGraphicsClear(graphics, 0xdeadbeef); + expect(ObjectBusy, status); status = Ok; /* GdipMeasureCharacterRanges */ /* GdipMeasureString */ status = GdipResetClip(graphics); @@ -878,6 +880,14 @@ static void test_isempty(void) ReleaseDC(0, hdc); } +static void test_clear(void) +{ + GpStatus status; + + status = GdipGraphicsClear(NULL, 0xdeadbeef); + expect(InvalidParameter, status); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -901,6 +911,7 @@ START_TEST(graphics) test_transformpoints(); test_get_set_clip(); test_isempty(); + test_clear(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index cbadd8b..cbb59e5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -169,6 +169,7 @@ GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*); GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); +GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB); GpStatus WINGDIPAPI GdipMeasureString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*,GDIPCONST GpStringFormat*,RectF*,INT*,INT*); GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics*, GDIPCONST WCHAR*,

1 0

Jan de Mooij : comdlg32/printdlg: Leave FromPages/ ToPages empty if it contains max. WORD value.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: f815b8b9d5fe68d8d2a17c64e84b4a027a14beda URL: http://source.winehq.org/git/wine.git/?a=commit;h=f815b8b9d5fe68d8d2a17c64e… Author: Jan de Mooij <jandemooij(a)gmail.com> Date: Fri Sep 5 11:17:53 2008 +0200 comdlg32/printdlg: Leave FromPages/ToPages empty if it contains max. WORD value. --- dlls/comdlg32/printdlg.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index bc49bfc..ccf5145 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -956,9 +956,12 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, lpdm = PrintStructures->lpDevMode; /* use this as a shortcut */ if(!(lppd->Flags & PD_PRINTSETUP)) { - /* Print range (All/Range/Selection) */ - SetDlgItemInt(hDlg, edt1, lppd->nFromPage, FALSE); - SetDlgItemInt(hDlg, edt2, lppd->nToPage, FALSE); + /* Print range (All/Range/Selection) */ + if(lppd->nFromPage != 0xffff) + SetDlgItemInt(hDlg, edt1, lppd->nFromPage, FALSE); + if(lppd->nToPage != 0xffff) + SetDlgItemInt(hDlg, edt2, lppd->nToPage, FALSE); + CheckRadioButton(hDlg, rad1, rad3, rad1); /* default */ if (lppd->Flags & PD_NOSELECTION) EnableWindow(GetDlgItem(hDlg, rad2), FALSE); @@ -1160,9 +1163,12 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, lpdm = PrintStructures->lpDevMode; /* use this as a shortcut */ if(!(lppd->Flags & PD_PRINTSETUP)) { - /* Print range (All/Range/Selection) */ - SetDlgItemInt(hDlg, edt1, lppd->nFromPage, FALSE); - SetDlgItemInt(hDlg, edt2, lppd->nToPage, FALSE); + /* Print range (All/Range/Selection) */ + if(lppd->nFromPage != 0xffff) + SetDlgItemInt(hDlg, edt1, lppd->nFromPage, FALSE); + if(lppd->nToPage != 0xffff) + SetDlgItemInt(hDlg, edt2, lppd->nToPage, FALSE); + CheckRadioButton(hDlg, rad1, rad3, rad1); /* default */ if (lppd->Flags & PD_NOSELECTION) EnableWindow(GetDlgItem(hDlg, rad2), FALSE);

1 0

Jan de Mooij : comdlg32/printdlg: If ToPages field is left empty set it to FromPages value.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: f9f881bfc2f8810a79874ba2f643544dcc8acf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f881bfc2f8810a79874ba2f… Author: Jan de Mooij <jandemooij(a)gmail.com> Date: Fri Sep 5 11:08:49 2008 +0200 comdlg32/printdlg: If ToPages field is left empty set it to FromPages value. --- dlls/comdlg32/printdlg.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 52ac3c6..bc49bfc 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -309,8 +309,13 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg, if (IsDlgButtonChecked(hDlg, rad3) == BST_CHECKED) { /* Pages */ WORD nToPage; WORD nFromPage; + BOOL translated; nFromPage = GetDlgItemInt(hDlg, edt1, NULL, FALSE); - nToPage = GetDlgItemInt(hDlg, edt2, NULL, FALSE); + nToPage = GetDlgItemInt(hDlg, edt2, &translated, FALSE); + + /* if no ToPage value is entered, use the FromPage value */ + if(!translated) nToPage = nFromPage; + if (nFromPage < lppd->nMinPage || nFromPage > lppd->nMaxPage || nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage) { WCHAR resourcestr[256]; @@ -407,8 +412,13 @@ static BOOL PRINTDLG_UpdatePrintDlgW(HWND hDlg, if (IsDlgButtonChecked(hDlg, rad3) == BST_CHECKED) { /* Pages */ WORD nToPage; WORD nFromPage; + BOOL translated; nFromPage = GetDlgItemInt(hDlg, edt1, NULL, FALSE); - nToPage = GetDlgItemInt(hDlg, edt2, NULL, FALSE); + nToPage = GetDlgItemInt(hDlg, edt2, &translated, FALSE); + + /* if no ToPage value is entered, use the FromPage value */ + if(!translated) nToPage = nFromPage; + if (nFromPage < lppd->nMinPage || nFromPage > lppd->nMaxPage || nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage) { WCHAR resourcestr[256];

1 0

Jeff Zaroyko : dsound: Check for invalid parameter when unlocking secondary buffers.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: e55a702928b9efb9f51ed7817dc76d41e53fc9fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55a702928b9efb9f51ed7817… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Wed Sep 3 07:08:21 2008 +1000 dsound: Check for invalid parameter when unlocking secondary buffers. --- dlls/dsound/buffer.c | 7 ++++++- dlls/dsound/tests/ds3d.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 480e8a1..6659a47 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -735,7 +735,12 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock( { RtlAcquireResourceShared(&iter->lock, TRUE); if (x1) - DSOUND_MixToTemporary(iter, (DWORD_PTR)p1 - (DWORD_PTR)iter->buffer->memory, x1, FALSE); + { + if(x1 + (DWORD_PTR)p1 - (DWORD_PTR)iter->buffer->memory > iter->buflen) + hres = DSERR_INVALIDPARAM; + else + DSOUND_MixToTemporary(iter, (DWORD_PTR)p1 - (DWORD_PTR)iter->buffer->memory, x1, FALSE); + } if (x2) DSOUND_MixToTemporary(iter, 0, x2, FALSE); RtlReleaseResource(&iter->lock); diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index de3e38c..c3fa0ed 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -197,6 +197,9 @@ static int buffer_refill(play_state_t* state, DWORD size) state->written+=len2; } state->offset=state->written % state->buffer_size; + /* some apps blindly pass &ptr1 instead of ptr1 */ + rc=IDirectSoundBuffer_Unlock(state->dsbo,&ptr1,len1,ptr2,len2); + ok(rc==DSERR_INVALIDPARAM, "IDDirectSoundBuffer_Unlock(): expected %08x got %08x, %p %p\n",DSERR_INVALIDPARAM, rc, &ptr1, ptr1); rc=IDirectSoundBuffer_Unlock(state->dsbo,ptr1,len1,ptr2,len2); ok(rc==DS_OK,"IDirectSoundBuffer_Unlock() failed: %08x\n", rc); if (rc!=DS_OK)

1 0

Vincent Povirk : explorer: Modify rects passed to SHAppBarMessage to not interfere with existing appbars .
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: aacfc6ed95660ce3d730b557f91baa43636f19fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacfc6ed95660ce3d730b557f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 2 16:06:42 2008 -0500 explorer: Modify rects passed to SHAppBarMessage to not interfere with existing appbars. --- dlls/shell32/tests/appbar.c | 28 +++++++++++----------- programs/explorer/appbar.c | 51 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aacfc6ed95660ce3d730b…

1 0

Vincent Povirk : explorer: Track appbar positions and send ABN_POSCHANGED notifications.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 8adae9aa1f7034e905cd87b4942626311ec363a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adae9aa1f7034e905cd87b49… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 2 15:36:21 2008 -0500 explorer: Track appbar positions and send ABN_POSCHANGED notifications. --- programs/explorer/appbar.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c index 02e3acd..b67a60e 100644 --- a/programs/explorer/appbar.c +++ b/programs/explorer/appbar.c @@ -48,6 +48,10 @@ struct appbar_data struct list entry; HWND hwnd; UINT callback_msg; + UINT edge; + RECT rc; + BOOL space_reserved; + /* BOOL autohide; */ }; static struct list appbars = LIST_INIT(appbars); @@ -65,6 +69,19 @@ static struct appbar_data* get_appbar(HWND hwnd) return NULL; } +/* send_poschanged: send ABN_POSCHANGED to every appbar except one */ +static void send_poschanged(HWND hwnd) +{ + struct appbar_data* data; + LIST_FOR_EACH_ENTRY(data, &appbars, struct appbar_data, entry) + { + if (data->hwnd != hwnd) + { + PostMessageW(data->hwnd, data->callback_msg, ABN_POSCHANGED, 0); + } + } +} + static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) { struct appbar_data* data; @@ -95,6 +112,8 @@ static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) { list_remove(&data->entry); + send_poschanged(abd->hWnd); + HeapFree(GetProcessHeap(), 0, data); } else @@ -105,6 +124,24 @@ static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) return TRUE; case ABM_SETPOS: WINE_FIXME("SHAppBarMessage(ABM_SETPOS, hwnd=%p, edge=%x, rc=%s): stub\n", abd->hWnd, abd->uEdge, wine_dbgstr_rect(&abd->rc)); + if (abd->uEdge > ABE_BOTTOM) + { + WINE_WARN("invalid edge %i for %p\n", abd->uEdge, abd->hWnd); + return TRUE; + } + if ((data = get_appbar(abd->hWnd))) + { + if (!EqualRect(&abd->rc, &data->rc)) + send_poschanged(abd->hWnd); + + data->edge = abd->uEdge; + data->rc = abd->rc; + data->space_reserved = TRUE; + } + else + { + WINE_WARN("app sent ABM_SETPOS message for %p without ABM_ADD\n", abd->hWnd); + } return TRUE; case ABM_GETSTATE: WINE_FIXME("SHAppBarMessage(ABM_GETSTATE): stub\n");

1 0

Vincent Povirk : explorer: Implement ABM_ADD and ABM_REMOVE.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 96f8de0de9b7066fa0842c646ac75ddab496f058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96f8de0de9b7066fa0842c646… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 2 15:17:09 2008 -0500 explorer: Implement ABM_ADD and ABM_REMOVE. --- dlls/shell32/tests/appbar.c | 2 +- programs/explorer/appbar.c | 51 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 558eb4e..108ead3 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -156,7 +156,7 @@ static void test_setpos(void) /* ABM_NEW should return FALSE if the window is already registered */ ret = SHAppBarMessage(ABM_NEW, &abd); - todo_wine ok(ret == FALSE, "SHAppBarMessage returned %i\n", ret); + ok(ret == FALSE, "SHAppBarMessage returned %i\n", ret); do_events(); /* dock window1 to the bottom of the screen */ diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c index 17c0b0a..02e3acd 100644 --- a/programs/explorer/appbar.c +++ b/programs/explorer/appbar.c @@ -43,15 +43,62 @@ struct appbar_response static HWND appbarmsg_window = NULL; +struct appbar_data +{ + struct list entry; + HWND hwnd; + UINT callback_msg; +}; + +static struct list appbars = LIST_INIT(appbars); + +static struct appbar_data* get_appbar(HWND hwnd) +{ + struct appbar_data* data; + + LIST_FOR_EACH_ENTRY(data, &appbars, struct appbar_data, entry) + { + if (data->hwnd == hwnd) + return data; + } + + return NULL; +} + static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) { + struct appbar_data* data; + switch (msg) { case ABM_NEW: - WINE_FIXME("SHAppBarMessage(ABM_NEW, hwnd=%p, callback=%x): stub\n", abd->hWnd, abd->uCallbackMessage); + if (get_appbar(abd->hWnd)) + { + /* fail when adding an hwnd the second time */ + return FALSE; + } + + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct appbar_data)); + if (!data) + { + WINE_ERR("out of memory\n"); + return FALSE; + } + data->hwnd = abd->hWnd; + data->callback_msg = abd->uCallbackMessage; + + list_add_tail(&appbars, &data->entry); + return TRUE; case ABM_REMOVE: - WINE_FIXME("SHAppBarMessage(ABM_REMOVE, hwnd=%p): stub\n", abd->hWnd); + if ((data = get_appbar(abd->hWnd))) + { + list_remove(&data->entry); + + HeapFree(GetProcessHeap(), 0, data); + } + else + WINE_WARN("removing hwnd %p not on the list\n", abd->hWnd); return TRUE; case ABM_QUERYPOS: WINE_FIXME("SHAppBarMessage(ABM_QUERYPOS, hwnd=%p, edge=%x, rc=%s): stub\n", abd->hWnd, abd->uEdge, wine_dbgstr_rect(&abd->rc));

1 0

Vincent Povirk : shell32: Add tests for SHAppBarMessage.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: b4c78be585aa2b7c1df1f0fe7863f6b62c4adc6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c78be585aa2b7c1df1f0fe7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 2 15:08:20 2008 -0500 shell32: Add tests for SHAppBarMessage. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/appbar.c | 405 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/systray.c | 63 +------ 3 files changed, 407 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4c78be585aa2b7c1df1f…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2008