December 2009 - Wine-Commits

Vincent Povirk : gdiplus: Add test for image resolution functions.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: f71cb580a43903838abcf855281f503edaa8e3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71cb580a43903838abcf8552… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 26 20:25:01 2009 -0500 gdiplus: Add test for image resolution functions. --- dlls/gdiplus/tests/image.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 67a2fa8..4721a58 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -889,6 +889,69 @@ static void test_createfromwmf(void) GdipDisposeImage(img); } +static void test_resolution(void) +{ + GpStatus stat; + GpBitmap *bitmap; + REAL res=-1.0; + HDC screendc; + int screenxres, screenyres; + + /* create Bitmap */ + stat = GdipCreateBitmapFromScan0(1, 1, 32, PixelFormat24bppRGB, NULL, &bitmap); + expect(Ok, stat); + + /* test invalid values */ + stat = GdipGetImageHorizontalResolution(NULL, &res); + expect(InvalidParameter, stat); + + stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, NULL); + expect(InvalidParameter, stat); + + stat = GdipGetImageVerticalResolution(NULL, &res); + expect(InvalidParameter, stat); + + stat = GdipGetImageVerticalResolution((GpImage*)bitmap, NULL); + expect(InvalidParameter, stat); + + stat = GdipBitmapSetResolution(NULL, 96.0, 96.0); + todo_wine expect(InvalidParameter, stat); + + stat = GdipBitmapSetResolution(bitmap, 0.0, 0.0); + todo_wine expect(InvalidParameter, stat); + + /* defaults to screen resolution */ + screendc = GetDC(0); + + screenxres = GetDeviceCaps(screendc, LOGPIXELSX); + screenyres = GetDeviceCaps(screendc, LOGPIXELSY); + + ReleaseDC(0, screendc); + + stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &res); + todo_wine expect(Ok, stat); + todo_wine expectf((REAL)screenxres, res); + + stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &res); + todo_wine expect(Ok, stat); + todo_wine expectf((REAL)screenyres, res); + + /* test changing the resolution */ + stat = GdipBitmapSetResolution(bitmap, screenxres*2.0, screenyres*3.0); + todo_wine expect(Ok, stat); + + stat = GdipGetImageHorizontalResolution((GpImage*)bitmap, &res); + todo_wine expect(Ok, stat); + todo_wine expectf(screenxres*2.0, res); + + stat = GdipGetImageVerticalResolution((GpImage*)bitmap, &res); + todo_wine expect(Ok, stat); + todo_wine expectf(screenyres*3.0, res); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); +} + static void test_createhbitmap(void) { GpStatus stat; @@ -1465,6 +1528,7 @@ START_TEST(image) test_getrawformat(); test_loadwmf(); test_createfromwmf(); + test_resolution(); test_createhbitmap(); test_getsetpixel(); test_palette();

1 0

Vincent Povirk : gdiplus: Add test for GdipCreateMetafileFromWmf.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 53a3307983e7d1f9ac8b73973b3c8ac88c8d924a URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a3307983e7d1f9ac8b73973… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 26 20:06:34 2009 -0500 gdiplus: Add test for GdipCreateMetafileFromWmf. --- dlls/gdiplus/tests/image.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 31656e8..e35d3a3 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -853,6 +853,42 @@ static void test_loadwmf(void) GdipDisposeImage(img); } +static void test_createfromwmf(void) +{ + HMETAFILE hwmf; + GpImage *img; + GpStatus stat; + GpRectF bounds; + GpUnit unit; + REAL res = 12345.0; + + hwmf = SetMetaFileBitsEx(sizeof(wmfimage)-sizeof(WmfPlaceableFileHeader), + wmfimage+sizeof(WmfPlaceableFileHeader)); + ok(hwmf != 0, "SetMetaFileBitsEx failed\n"); + + stat = GdipCreateMetafileFromWmf(hwmf, TRUE, + (WmfPlaceableFileHeader*)wmfimage, (GpMetafile**)&img); + expect(Ok, stat); + + stat = GdipGetImageBounds(img, &bounds, &unit); + expect(Ok, stat); + todo_wine expect(UnitPixel, unit); + expectf(0.0, bounds.X); + todo_wine expectf(0.0, bounds.Y); + todo_wine expectf(320.0, bounds.Width); + todo_wine expectf(320.0, bounds.Height); + + stat = GdipGetImageHorizontalResolution(img, &res); + todo_wine expect(Ok, stat); + todo_wine expectf(1440.0, res); + + stat = GdipGetImageVerticalResolution(img, &res); + todo_wine expect(Ok, stat); + todo_wine expectf(1440.0, res); + + GdipDisposeImage(img); +} + static void test_createhbitmap(void) { GpStatus stat; @@ -1428,6 +1464,7 @@ START_TEST(image) test_fromhicon(); test_getrawformat(); test_loadwmf(); + test_createfromwmf(); test_createhbitmap(); test_getsetpixel(); test_palette();

1 0

Vincent Povirk : gdiplus: Fix typo in GdipCreateMetafileFromWmf.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: c38d33426670ff04ddfa677b8fce800737c14880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38d33426670ff04ddfa677b8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 26 20:07:37 2009 -0500 gdiplus: Fix typo in GdipCreateMetafileFromWmf. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7d5caf8..f7a8eaf 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1263,7 +1263,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, (*metafile)->image.palette_size = 0; (*metafile)->image.palette_entries = NULL; (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); - (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Right) / ((REAL) placeable->Inch); + (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Top) / ((REAL) placeable->Inch); (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right - placeable->BoundingBox.Left)) / ((REAL) placeable->Inch); (*metafile)->bounds.Height = ((REAL) (placeable->BoundingBox.Bottom diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index e35d3a3..67a2fa8 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -874,7 +874,7 @@ static void test_createfromwmf(void) expect(Ok, stat); todo_wine expect(UnitPixel, unit); expectf(0.0, bounds.X); - todo_wine expectf(0.0, bounds.Y); + expectf(0.0, bounds.Y); todo_wine expectf(320.0, bounds.Width); todo_wine expectf(320.0, bounds.Height);

1 0

Vincent Povirk : gdiplus: Test the ability to load WMF images.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: f87039103f368935454f5e91823bafac0d77cfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87039103f368935454f5e918… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 26 19:25:34 2009 -0500 gdiplus: Test the ability to load WMF images. --- dlls/gdiplus/tests/image.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9f70191..024c739 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -64,7 +64,7 @@ static void test_bufferrawformat(void* buff, int size, REFGUID expected, int lin LPBYTE data; HRESULT hres; GpStatus stat; - GpBitmap *bmp; + GpImage *img; hglob = GlobalAlloc (0, size); data = GlobalLock (hglob); @@ -75,16 +75,16 @@ static void test_bufferrawformat(void* buff, int size, REFGUID expected, int lin ok_(__FILE__, line)(hres == S_OK, "Failed to create a stream\n"); if(hres != S_OK) return; - stat = GdipCreateBitmapFromStream(stream, &bmp); + stat = GdipLoadImageFromStream(stream, &img); ok_(__FILE__, line)(stat == Ok, "Failed to create a Bitmap\n"); if(stat != Ok){ IStream_Release(stream); return; } - expect_rawformat(expected, (GpImage*)bmp, line, todo); + expect_rawformat(expected, img, line, todo); - GdipDisposeImage((GpImage*)bmp); + GdipDisposeImage(img); IStream_Release(stream); } @@ -780,12 +780,28 @@ static const unsigned char jpgimage[285] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xda,0x00,0x0c,0x03,0x01, 0x00,0x02,0x11,0x03,0x11,0x00,0x3f,0x00,0xb2,0xc0,0x07,0xff,0xd9 }; +/* 320x320 twip wmf */ +static const unsigned char wmfimage[180] = { +0xd7,0xcd,0xc6,0x9a,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x01,0x40,0x01,0xa0,0x05, +0x00,0x00,0x00,0x00,0xb1,0x52,0x01,0x00,0x09,0x00,0x00,0x03,0x4f,0x00,0x00,0x00, +0x0f,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x0b,0x02,0x00,0x00, +0x00,0x00,0x05,0x00,0x00,0x00,0x0c,0x02,0x40,0x01,0x40,0x01,0x04,0x00,0x00,0x00, +0x02,0x01,0x01,0x00,0x04,0x00,0x00,0x00,0x04,0x01,0x0d,0x00,0x08,0x00,0x00,0x00, +0xfa,0x02,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00, +0x2d,0x01,0x00,0x00,0x07,0x00,0x00,0x00,0xfc,0x02,0x01,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x04,0x00,0x00,0x00,0x2d,0x01,0x01,0x00,0x07,0x00,0x00,0x00,0xfc,0x02, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x2d,0x01,0x02,0x00, +0x07,0x00,0x00,0x00,0x1b,0x04,0x40,0x01,0x40,0x01,0x00,0x00,0x00,0x00,0x04,0x00, +0x00,0x00,0xf0,0x01,0x00,0x00,0x04,0x00,0x00,0x00,0xf0,0x01,0x01,0x00,0x03,0x00, +0x00,0x00,0x00,0x00 +}; static void test_getrawformat(void) { test_bufferrawformat((void*)pngimage, sizeof(pngimage), &ImageFormatPNG, __LINE__, FALSE); test_bufferrawformat((void*)gifimage, sizeof(gifimage), &ImageFormatGIF, __LINE__, FALSE); test_bufferrawformat((void*)bmpimage, sizeof(bmpimage), &ImageFormatBMP, __LINE__, FALSE); test_bufferrawformat((void*)jpgimage, sizeof(jpgimage), &ImageFormatJPEG, __LINE__, FALSE); + test_bufferrawformat((void*)wmfimage, sizeof(wmfimage), &ImageFormatWMF, __LINE__, FALSE); } static void test_createhbitmap(void)

1 0

Vincent Povirk : gdiplus: Add test for size of metafiles loaded from streams.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 27480405dafee46da0c86c2919b3fa10cd3c376e URL: http://source.winehq.org/git/wine.git/?a=commit;h=27480405dafee46da0c86c291… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 26 19:52:00 2009 -0500 gdiplus: Add test for size of metafiles loaded from streams. --- dlls/gdiplus/tests/image.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 024c739..31656e8 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -804,6 +804,55 @@ static void test_getrawformat(void) test_bufferrawformat((void*)wmfimage, sizeof(wmfimage), &ImageFormatWMF, __LINE__, FALSE); } +static void test_loadwmf(void) +{ + LPSTREAM stream; + HGLOBAL hglob; + LPBYTE data; + HRESULT hres; + GpStatus stat; + GpImage *img; + GpRectF bounds; + GpUnit unit; + REAL res = 12345.0; + + hglob = GlobalAlloc (0, sizeof(wmfimage)); + data = GlobalLock (hglob); + memcpy(data, wmfimage, sizeof(wmfimage)); + GlobalUnlock(hglob); data = NULL; + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + if(hres != S_OK) return; + + stat = GdipLoadImageFromStream(stream, &img); + ok(stat == Ok, "Failed to create a Bitmap\n"); + if(stat != Ok){ + IStream_Release(stream); + return; + } + + IStream_Release(stream); + + stat = GdipGetImageBounds(img, &bounds, &unit); + expect(Ok, stat); + todo_wine expect(UnitPixel, unit); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + todo_wine expectf(320.0, bounds.Width); + todo_wine expectf(320.0, bounds.Height); + + stat = GdipGetImageHorizontalResolution(img, &res); + todo_wine expect(Ok, stat); + todo_wine expectf(1440.0, res); + + stat = GdipGetImageVerticalResolution(img, &res); + todo_wine expect(Ok, stat); + todo_wine expectf(1440.0, res); + + GdipDisposeImage(img); +} + static void test_createhbitmap(void) { GpStatus stat; @@ -1378,6 +1427,7 @@ START_TEST(image) test_testcontrol(); test_fromhicon(); test_getrawformat(); + test_loadwmf(); test_createhbitmap(); test_getsetpixel(); test_palette();

1 0

Alexandre Julliard : kernel32: Make GMEM_DDESHARE blocks owned by the calling module.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: eb4477120a5e5c4f30ae1672b8913b80d4dd4a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4477120a5e5c4f30ae1672b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 28 12:11:46 2009 +0100 kernel32: Make GMEM_DDESHARE blocks owned by the calling module. --- dlls/kernel32/global16.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c index c5dcc14..4c29389 100644 --- a/dlls/kernel32/global16.c +++ b/dlls/kernel32/global16.c @@ -283,7 +283,11 @@ HGLOBAL16 WINAPI GlobalAlloc16( HANDLE16 owner = GetCurrentPDB16(); if (flags & GMEM_DDESHARE) - owner = GetExePtr(owner); /* Make it a module handle */ + { + /* make it owned by the calling module */ + STACK16FRAME *frame = CURRENT_STACK16; + owner = GetExePtr( frame->cs ); + } return GLOBAL_Alloc( flags, size, owner, WINE_LDT_FLAGS_DATA ); }

1 0

Alexandre Julliard : shell32: Don' t use the instance of the owner window for the autocomplete listbox.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 1346740a57ac1d2df2291b3c16f9809f43400d4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1346740a57ac1d2df2291b3c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 17:59:33 2009 +0100 shell32: Don't use the instance of the owner window for the autocomplete listbox. --- dlls/shell32/autocomplete.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 949a439..f50c2b7 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -56,6 +56,7 @@ #include "shlobj.h" #include "shldisp.h" #include "debughlp.h" +#include "shell32_main.h" #include "wine/unicode.h" @@ -106,8 +107,7 @@ static void create_listbox(IAutoCompleteImpl *This) This->hwndListBox = CreateWindowExW(0, WC_LISTBOXW, NULL, WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hwndParent, NULL, - (HINSTANCE)GetWindowLongPtrW( hwndParent, GWLP_HINSTANCE ), NULL); + hwndParent, NULL, shell32_hInstance, NULL ); if (This->hwndListBox) { This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc);

1 0

Alexandre Julliard : comdlg32: Store the open file name A structure directly instead of using a private pointer .
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 6cb6862806bcec9770410810bd3de6d901c83a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb6862806bcec9770410810b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 17:36:20 2009 +0100 comdlg32: Store the open file name A structure directly instead of using a private pointer. --- dlls/comdlg32/filedlg.c | 63 ++++++++++++++++++-------------------------- dlls/comdlg32/filedlg31.h | 2 +- 2 files changed, 27 insertions(+), 38 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 6c36377..980fc5f 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -105,11 +105,6 @@ typedef struct tagLookInInfo UINT uSelectedItem; } LookInInfos; -typedef struct tagFD32_PRIVATE -{ - OPENFILENAMEA *ofnA; /* original structure if 32bits ansi dialog */ -} FD32_PRIVATE, *PFD32_PRIVATE; - /*********************************************************************** * Defines and global variables @@ -3748,7 +3743,7 @@ static void MemFree(void *mem) static BOOL FD32_GetTemplate(PFD31_DATA lfs) { LPOPENFILENAMEW ofnW = lfs->ofnW; - PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632; + LPOPENFILENAMEA ofnA = lfs->ofnA; HANDLE hDlgTmpl; if (ofnW->Flags & OFN_ENABLETEMPLATEHANDLE) @@ -3762,9 +3757,9 @@ static BOOL FD32_GetTemplate(PFD31_DATA lfs) else if (ofnW->Flags & OFN_ENABLETEMPLATE) { HRSRC hResInfo; - if (priv->ofnA) - hResInfo = FindResourceA(priv->ofnA->hInstance, - priv->ofnA->lpTemplateName, + if (ofnA) + hResInfo = FindResourceA(ofnA->hInstance, + ofnA->lpTemplateName, (LPSTR)RT_DIALOG); else hResInfo = FindResourceW(ofnW->hInstance, @@ -3808,13 +3803,10 @@ static BOOL FD32_GetTemplate(PFD31_DATA lfs) static BOOL CALLBACK FD32_Init(LPARAM lParam, PFD31_DATA lfs, DWORD data) { BOOL IsUnicode = (BOOL) data; - PFD32_PRIVATE priv; - priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FD32_PRIVATE)); - lfs->private1632 = priv; - if (NULL == lfs->private1632) return FALSE; if (IsUnicode) { + lfs->ofnA = NULL; lfs->ofnW = (LPOPENFILENAMEW) lParam; if (lfs->ofnW->Flags & OFN_ENABLEHOOK) if (lfs->ofnW->lpfnHook) @@ -3822,12 +3814,12 @@ static BOOL CALLBACK FD32_Init(LPARAM lParam, PFD31_DATA lfs, DWORD data) } else { - priv->ofnA = (LPOPENFILENAMEA) lParam; - if (priv->ofnA->Flags & OFN_ENABLEHOOK) - if (priv->ofnA->lpfnHook) + lfs->ofnA = (LPOPENFILENAMEA) lParam; + if (lfs->ofnA->Flags & OFN_ENABLEHOOK) + if (lfs->ofnA->lpfnHook) lfs->hook = TRUE; lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lfs->ofnW)); - FD31_MapOfnStructA(priv->ofnA, lfs->ofnW, lfs->open); + FD31_MapOfnStructA(lfs->ofnA, lfs->ofnW, lfs->open); } if (! FD32_GetTemplate(lfs)) return FALSE; @@ -3844,15 +3836,14 @@ static BOOL CALLBACK FD32_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM LPARAM lParam) { BOOL ret; - PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632; - if (priv->ofnA) + if (lfs->ofnA) { TRACE("Call hookA %p (%p, %04x, %08lx, %08lx)\n", - priv->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam); - ret = priv->ofnA->lpfnHook(lfs->hwnd, wMsg, wParam, lParam); + lfs->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam); + ret = lfs->ofnA->lpfnHook(lfs->hwnd, wMsg, wParam, lParam); TRACE("ret hookA %p (%p, %04x, %08lx, %08lx)\n", - priv->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam); + lfs->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam); return ret; } @@ -3870,25 +3861,25 @@ static BOOL CALLBACK FD32_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM */ static void CALLBACK FD32_UpdateResult(const FD31_DATA *lfs) { - PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632; LPOPENFILENAMEW ofnW = lfs->ofnW; + LPOPENFILENAMEA ofnA = lfs->ofnA; - if (priv->ofnA) + if (ofnA) { LPSTR lpszTemp; if (ofnW->nMaxFile && !WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1, - priv->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL )) - priv->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0; + ofnA->lpstrFile, ofnA->nMaxFile, NULL, NULL )) + ofnA->lpstrFile[ofnA->nMaxFile-1] = 0; /* offsets are not guaranteed to be the same in WCHAR to MULTIBYTE conversion */ /* set filename offset */ - lpszTemp = PathFindFileNameA(priv->ofnA->lpstrFile); - priv->ofnA->nFileOffset = (lpszTemp - priv->ofnA->lpstrFile); + lpszTemp = PathFindFileNameA(ofnA->lpstrFile); + ofnA->nFileOffset = (lpszTemp - ofnA->lpstrFile); /* set extension offset */ - lpszTemp = PathFindExtensionA(priv->ofnA->lpstrFile); - priv->ofnA->nFileExtension = (*lpszTemp) ? (lpszTemp - priv->ofnA->lpstrFile) + 1 : 0; + lpszTemp = PathFindExtensionA(ofnA->lpstrFile); + ofnA->nFileExtension = (*lpszTemp) ? (lpszTemp - ofnA->lpstrFile) + 1 : 0; } } @@ -3898,14 +3889,14 @@ static void CALLBACK FD32_UpdateResult(const FD31_DATA *lfs) */ static void CALLBACK FD32_UpdateFileTitle(const FD31_DATA *lfs) { - PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632; LPOPENFILENAMEW ofnW = lfs->ofnW; + LPOPENFILENAMEA ofnA = lfs->ofnA; - if (priv->ofnA) + if (ofnA) { if (!WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFileTitle, -1, - priv->ofnA->lpstrFileTitle, ofnW->nMaxFileTitle, NULL, NULL )) - priv->ofnA->lpstrFileTitle[ofnW->nMaxFileTitle-1] = 0; + ofnA->lpstrFileTitle, ofnA->nMaxFileTitle, NULL, NULL )) + ofnA->lpstrFileTitle[ofnA->nMaxFileTitle-1] = 0; } } @@ -3926,10 +3917,8 @@ static LRESULT CALLBACK FD32_SendLbGetCurSel(const FD31_DATA *lfs) */ static void CALLBACK FD32_Destroy(const FD31_DATA *lfs) { - PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632; - /* if ofnW has been allocated, have to free everything in it */ - if (NULL != priv && NULL != priv->ofnA) + if (lfs->ofnA) { FD31_FreeOfnW(lfs->ofnW); HeapFree(GetProcessHeap(), 0, lfs->ofnW); diff --git a/dlls/comdlg32/filedlg31.h b/dlls/comdlg32/filedlg31.h index 7328f07..ed7a173 100644 --- a/dlls/comdlg32/filedlg31.h +++ b/dlls/comdlg32/filedlg31.h @@ -46,7 +46,7 @@ struct tagFD31_DATA BOOL open; /* TRUE if open dialog, FALSE if save dialog */ LPOPENFILENAMEW ofnW; /* pointer either to the original structure or a W copy for A/16 API */ - LPVOID private1632; /* 16/32 bit caller private data */ + LPOPENFILENAMEA ofnA; /* original structure if 32bits ansi dialog */ PFD31_CALLBACKS callbacks; /* callbacks to handle 16/32 bit differences */ };

1 0

Alexandre Julliard : comdlg32: Get rid of the 16-bit callback support.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 0e00a61a38cdd7beff40ec75284cc0a5f1e03161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e00a61a38cdd7beff40ec752… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 17:47:55 2009 +0100 comdlg32: Get rid of the 16-bit callback support. --- dlls/comdlg32/filedlg.c | 149 +-------------------------------------------- dlls/comdlg32/filedlg31.c | 82 ++++++++++++++++++++++--- dlls/comdlg32/filedlg31.h | 24 ++------ 3 files changed, 81 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e00a61a38cdd7beff40e…

1 0

Alexandre Julliard : comdlg32: Don' t use the instance of the owner window for dialog boxes.
by Alexandre Julliard Dec. 28, 2009

Dec. 28, 2009

Module: wine Branch: master Commit: 82016c19efadbd1866a89625e63d8e7af3109d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82016c19efadbd1866a89625e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 23 17:55:04 2009 +0100 comdlg32: Don't use the instance of the owner window for dialog boxes. --- dlls/comdlg32/filedlg.c | 8 ++------ dlls/comdlg32/printdlg.c | 6 ++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 034403e..5e8f75e 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3867,7 +3867,6 @@ static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* address of structure with d UINT dlgType /* type dialogue : open/save */ ) { - HINSTANCE hInst; BOOL bRet = FALSE; PFD31_DATA lfs; @@ -3877,8 +3876,7 @@ static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* address of structure with d lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, FALSE); if (lfs) { - hInst = (HINSTANCE)GetWindowLongPtrW( lpofn->hwndOwner, GWLP_HINSTANCE ); - bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner, + bRet = DialogBoxIndirectParamA( COMDLG32_hInstance, lfs->template, lpofn->hwndOwner, FD32_FileOpenDlgProc, (LPARAM)lfs); FD31_DestroyPrivate(lfs); } @@ -3896,7 +3894,6 @@ static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* address of structure with d UINT dlgType /* type dialogue : open/save */ ) { - HINSTANCE hInst; BOOL bRet = FALSE; PFD31_DATA lfs; @@ -3905,8 +3902,7 @@ static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* address of structure with d lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, TRUE); if (lfs) { - hInst = (HINSTANCE)GetWindowLongPtrW( lpofn->hwndOwner, GWLP_HINSTANCE ); - bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner, + bRet = DialogBoxIndirectParamW( COMDLG32_hInstance, lfs->template, lpofn->hwndOwner, FD32_FileOpenDlgProc, (LPARAM)lfs); FD31_DestroyPrivate(lfs); } diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 72d8dd8..149694a 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2080,7 +2080,6 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) return FALSE; } - hInst = (HINSTANCE)GetWindowLongPtrA( lppd->hwndOwner, GWLP_HINSTANCE ); if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; const struct pd_flags *pflag = pd_flags; @@ -2173,6 +2172,8 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd) /* and create & process the dialog . * -1 is failure, 0 is broken hwnd, everything else is ok. */ + hInst = COMDLG32_hInstance; + if (lppd->Flags & (PD_ENABLESETUPTEMPLATE | PD_ENABLEPRINTTEMPLATE)) hInst = lppd->hInstance; bRet = (0<DialogBoxIndirectParamA(hInst, ptr, lppd->hwndOwner, PrintDlgProcA, (LPARAM)PrintStructures)); @@ -2230,7 +2231,6 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd) return FALSE; } - hInst = (HINSTANCE)GetWindowLongPtrW( lppd->hwndOwner, GWLP_HINSTANCE ); if(TRACE_ON(commdlg)) { char flagstr[1000] = ""; const struct pd_flags *pflag = pd_flags; @@ -2323,6 +2323,8 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd) /* and create & process the dialog . * -1 is failure, 0 is broken hwnd, everything else is ok. */ + hInst = COMDLG32_hInstance; + if (lppd->Flags & (PD_ENABLESETUPTEMPLATE | PD_ENABLEPRINTTEMPLATE)) hInst = lppd->hInstance; bRet = (0<DialogBoxIndirectParamW(hInst, ptr, lppd->hwndOwner, PrintDlgProcW, (LPARAM)PrintStructures));

1 0