September 2007 - Wine-commits

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the SelectObject backends.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: e9f1638de6df17e705fa9db455ac9c7a19cd8ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f1638de6df17e705fa9db45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 21:00:44 2007 +0200 gdi32: Don't hold the GDI lock while calling the SelectObject backends. --- dlls/gdi32/gdiobj.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 9539d61..56d3f91 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1156,9 +1156,9 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ hObj ) header = GDI_GetObjPtr( hObj, MAGIC_DONTCARE ); if (header) { - if (header->funcs && header->funcs->pSelectObject) - ret = header->funcs->pSelectObject( hObj, hdc ); - GDI_ReleaseObj( hObj ); + const struct gdi_obj_funcs *funcs = header->funcs; + GDI_ReleaseObj( hObj ); + if (funcs && funcs->pSelectObject) ret = funcs->pSelectObject( hObj, hdc ); } } return ret;

1 0

Alexandre Julliard : gdi32: Don' t hold the GDI lock while calling the driver SelectFont function.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: d78a58298a8b5574b30c58b5477dae65d5f36713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d78a58298a8b5574b30c58b54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 21:01:00 2007 +0200 gdi32: Don't hold the GDI lock while calling the driver SelectFont function. --- dlls/gdi32/font.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 826e331..3b6ec3b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -588,14 +588,24 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) { HGDIOBJ ret = 0; - DC *dc = DC_GetDCPtr( hdc ); + DC *dc = get_dc_ptr( hdc ); if (!dc) return 0; + if (!GDI_inc_ref_count( handle )) + { + release_dc_ptr( dc ); + return 0; + } + if (dc->hFont != handle || dc->gdiFont == NULL) { if(GetDeviceCaps(dc->hSelf, TEXTCAPS) & TC_VA_ABLE) + { + FONTOBJ *font = GDI_GetObjPtr( handle, FONT_MAGIC ); /* to grab the GDI lock (FIXME) */ dc->gdiFont = WineEngCreateFontInstance(dc, handle); + if (font) GDI_ReleaseObj( handle ); + } } if (dc->funcs->pSelectFont) ret = dc->funcs->pSelectFont( dc->physDev, handle, dc->gdiFont ); @@ -603,15 +613,17 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) if (ret && dc->gdiFont) dc->gdiFont = 0; if (ret == HGDI_ERROR) + { + GDI_dec_ref_count( handle ); ret = 0; /* SelectObject returns 0 on error */ + } else { ret = dc->hFont; dc->hFont = handle; - GDI_inc_ref_count( handle ); GDI_dec_ref_count( ret ); } - DC_ReleaseDCPtr( dc ); + release_dc_ptr( dc ); return ret; }

1 0

Juan Lang : crypt32: Fix CryptQueryObject for embedded PKCS7 signatures.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: f880982176e0c308dc9247f0d5783dae818ae35d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f880982176e0c308dc9247f0d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 27 10:00:44 2007 -0700 crypt32: Fix CryptQueryObject for embedded PKCS7 signatures. --- dlls/crypt32/object.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 5dc6341..156b3df 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -365,25 +365,28 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) { - CERT_BLOB blob; + DWORD len; - ret = ImageGetCertificateData(file, 0, NULL, &blob.cbData); + ret = ImageGetCertificateData(file, 0, NULL, &len); if (ret) { - blob.pbData = HeapAlloc(GetProcessHeap(), 0, blob.cbData); - if (blob.pbData) + WIN_CERTIFICATE *winCert = HeapAlloc(GetProcessHeap(), 0, len); + + if (winCert) { - ret = ImageGetCertificateData(file, 0, - (WIN_CERTIFICATE *)blob.pbData, &blob.cbData); + ret = ImageGetCertificateData(file, 0, winCert, &len); if (ret) { + CERT_BLOB blob = { winCert->dwLength, + winCert->bCertificate }; + ret = CRYPT_QueryMessageObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED, pdwMsgAndCertEncodingType, NULL, phCertStore, phMsg); if (ret && pdwContentType) *pdwContentType = CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED; } - HeapFree(GetProcessHeap(), 0, blob.pbData); + HeapFree(GetProcessHeap(), 0, winCert); } } CloseHandle(file);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: b2bc712323706979987520259bd90da84f3b75bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2bc712323706979987520259… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 27 18:57:51 2007 +0200 Assorted spelling fixes. --- dlls/gdi32/bidi.c | 4 ++-- dlls/gdi32/font.c | 4 ++-- dlls/ntdll/signal_i386.c | 2 +- dlls/oleaut32/ungif.c | 6 +++--- dlls/twain_32/TWAIN | 2 +- dlls/user32/tests/win.c | 8 ++++---- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- dlls/winex11.drv/keyboard.c | 2 +- dlls/winspool.drv/info.c | 4 ++-- programs/cmd/wcmdmain.c | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2bc71232370697998752…

1 0

Alexandre Julliard : rpcrt4/tests: Remove static keywords that hide test failures.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: b7df430831a797dcd8cf85d94bb555f083790178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7df430831a797dcd8cf85d94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 20:13:21 2007 +0200 rpcrt4/tests: Remove static keywords that hide test failures. --- dlls/rpcrt4/tests/server.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index f4ba399..7db9202 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -442,13 +442,13 @@ basic_tests(void) { char string[] = "I am a string"; WCHAR wstring[] = {'I',' ','a','m',' ','a',' ','w','s','t','r','i','n','g', 0}; - static int f[5] = {1, 3, 0, -2, -4}; - static vector_t a = {1, 3, 7}; - static vector_t vec1 = {4, -2, 1}, vec2 = {-5, 2, 3}, *pvec2 = &vec2; - static pvectors_t pvecs = {&vec1, &pvec2}; - static sp_inner_t spi = {42}; - static sp_t sp = {-13, &spi}; - static aligns_t aligns = {3, 4, 5, 6.0}; + int f[5] = {1, 3, 0, -2, -4}; + vector_t a = {1, 3, 7}; + vector_t vec1 = {4, -2, 1}, vec2 = {-5, 2, 3}, *pvec2 = &vec2; + pvectors_t pvecs = {&vec1, &pvec2}; + sp_inner_t spi = {42}; + sp_t sp = {-13, &spi}; + aligns_t aligns = {3, 4, 5, 6.0}; pints_t pints; ptypes_t ptypes; padded_t padded; @@ -690,15 +690,15 @@ us_t_UserFree(ULONG *flags, us_t *pus) static void pointer_tests(void) { - static int a[] = {1, 2, 3, 4}; - static char p1[] = "11"; + int a[] = {1, 2, 3, 4}; + char p1[] = "11"; test_list_t *list = make_list(make_list(make_list(null_list()))); - static test_us_t tus = {{p1}}; + test_us_t tus = {{p1}}; int *pa[4]; ok(test_list_length(list) == 3, "RPC test_list_length\n"); ok(square_puint(p1) == 121, "RPC square_puint\n"); - ok(square_test_us(&tus) == 121, "RPC square_test_us\n"); + todo_wine ok(square_test_us(&tus) == 121, "RPC square_test_us\n"); pa[0] = &a[0]; pa[1] = &a[1]; @@ -717,14 +717,14 @@ pointer_tests(void) static void array_tests(void) { - static const char str1[25] = "Hello"; - static int m[2][3][4] = + const char str1[25] = "Hello"; + int m[2][3][4] = { {{1, 2, 3, 4}, {-1, -3, -5, -7}, {0, 2, 4, 6}}, {{1, -2, 3, -4}, {2, 3, 5, 7}, {-4, -1, -14, 4114}} }; - static int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - static vector_t vs[2] = {{1, -2, 3}, {4, -5, -6}}; + int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + vector_t vs[2] = {{1, -2, 3}, {4, -5, -6}}; cps_t cps; cpsc_t cpsc; cs_t *cs; @@ -765,18 +765,18 @@ array_tests(void) cps.ca1 = &c[2]; cps.n = 3; cps.ca2 = &c[3]; - ok(sum_cps(&cps) == 53, "RPC sum_cps\n"); + todo_wine ok(sum_cps(&cps) == 53, "RPC sum_cps\n"); cpsc.a = 4; cpsc.b = 5; cpsc.c = 1; cpsc.ca = c; - ok(sum_cpsc(&cpsc) == 6, "RPC sum_cpsc\n"); + todo_wine ok(sum_cpsc(&cpsc) == 6, "RPC sum_cpsc\n"); cpsc.a = 4; cpsc.b = 5; cpsc.c = 0; cpsc.ca = c; - ok(sum_cpsc(&cpsc) == 10, "RPC sum_cpsc\n"); + todo_wine ok(sum_cpsc(&cpsc) == 10, "RPC sum_cpsc\n"); ok(sum_toplev_conf_2n(c, 3) == 15, "RPC sum_toplev_conf_2n\n"); ok(sum_toplev_conf_cond(c, 5, 6, 1) == 10, "RPC sum_toplev_conf_cond\n");

1 0

Alexandre Julliard : winex11.drv: Always drag the full window for top-level windows to avoid having to grab the server .
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: e36ed76139a37aa1439048ee642acfdbfd25c28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36ed76139a37aa1439048ee6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 20:13:57 2007 +0200 winex11.drv: Always drag the full window for top-level windows to avoid having to grab the server. --- dlls/winex11.drv/winpos.c | 30 +++++------------------------- 1 files changed, 5 insertions(+), 25 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 330a31e..1e7da13 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -1244,10 +1244,8 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) BOOL iconic = style & WS_MINIMIZE; BOOL moved = FALSE; DWORD dwPoint = GetMessagePos (); - BOOL DragFullWindows = FALSE; - BOOL grab; + BOOL DragFullWindows = TRUE; Window parent_win, whole_win; - Display *old_gdi_display = NULL; struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; @@ -1265,8 +1263,6 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) /* if we are managed then we let the WM do all the work */ if (data->managed && X11DRV_WMMoveResizeWindow( hwnd, pt.x, pt.y, wParam )) return; - SystemParametersInfoA(SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0); - if (syscommand == SC_MOVE) { if (!hittest) hittest = start_size_move( hwnd, wParam, &capturePoint, style ); @@ -1344,20 +1340,11 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) SendMessageW( hwnd, WM_ENTERSIZEMOVE, 0, 0 ); set_movesize_capture( hwnd ); - /* grab the server only when moving top-level windows without desktop */ - grab = (!DragFullWindows && !parent && (root_window == DefaultRootWindow(gdi_display))); + /* we only allow disabling the full window drag for child windows, or in desktop mode */ + /* otherwise we'd need to grab the server and we want to avoid that */ + if (parent || (root_window != DefaultRootWindow(gdi_display))) + SystemParametersInfoA(SPI_GETDRAGFULLWINDOWS, 0, &DragFullWindows, 0); - if (grab) - { - wine_tsx11_lock(); - XSync( gdi_display, False ); - XGrabServer( thread_data->display ); - XSync( thread_data->display, False ); - /* switch gdi display to the thread display, since the server is grabbed */ - old_gdi_display = gdi_display; - gdi_display = thread_data->display; - wine_tsx11_unlock(); - } whole_win = X11DRV_get_whole_window( GetAncestor(hwnd,GA_ROOT) ); parent_win = parent ? X11DRV_get_whole_window( GetAncestor(parent,GA_ROOT) ) : root_window; @@ -1467,13 +1454,6 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) wine_tsx11_lock(); XUngrabPointer( thread_data->display, CurrentTime ); - if (grab) - { - XSync( thread_data->display, False ); - XUngrabServer( thread_data->display ); - XSync( thread_data->display, False ); - gdi_display = old_gdi_display; - } wine_tsx11_unlock(); thread_data->grab_window = None;

1 0

Alexandre Julliard : gdi32: Don' t pass an object pointer to the SelectObject backend functions.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: a1e31397e17685b4b994158a89ca2b90e41cfe74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e31397e17685b4b994158a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 20:14:13 2007 +0200 gdi32: Don't pass an object pointer to the SelectObject backend functions. --- dlls/gdi32/bitmap.c | 31 +++++++++++++++++++------------ dlls/gdi32/brush.c | 30 +++++++++++++++++------------- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/pen.c | 4 ++-- dlls/gdi32/region.c | 4 ++-- 7 files changed, 44 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index c1d0859..0aa7dd5 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bitmap); -static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ); +static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ); static INT BITMAP_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static INT BITMAP_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static BOOL BITMAP_DeleteObject( HGDIOBJ handle, void *obj ); @@ -554,32 +554,38 @@ BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, DC *dc ) /*********************************************************************** * BITMAP_SelectObject */ -static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ) +static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) { HGDIOBJ ret; - BITMAPOBJ *bitmap = obj; - DC *dc = DC_GetDCPtr( hdc ); + BITMAPOBJ *bitmap; + DC *dc; - if (!dc) return 0; - if (GetObjectType( hdc ) != OBJ_MEMDC) + if (!(bitmap = GDI_GetObjPtr( handle, BITMAP_MAGIC ))) return 0; + + if (!(dc = get_dc_ptr( hdc ))) { - DC_ReleaseDCPtr( dc ); + GDI_ReleaseObj( handle ); return 0; } + if (GetObjectType( hdc ) != OBJ_MEMDC) + { + ret = 0; + goto done; + } ret = dc->hBitmap; if (handle == dc->hBitmap) goto done; /* nothing to do */ if (bitmap->header.dwCount && (handle != GetStockObject(DEFAULT_BITMAP))) { WARN( "Bitmap already selected in another DC\n" ); - DC_ReleaseDCPtr( dc ); - return 0; + ret = 0; + goto done; } if (!bitmap->funcs && !BITMAP_SetOwnerDC( handle, dc )) { - DC_ReleaseDCPtr( dc ); - return 0; + ret = 0; + goto done; } if (dc->funcs->pSelectBitmap) handle = dc->funcs->pSelectBitmap( dc->physDev, handle ); @@ -594,7 +600,8 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ) else ret = 0; done: - DC_ReleaseDCPtr( dc ); + GDI_ReleaseObj( handle ); + release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 67d6e08..4b13bc0 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -42,7 +42,7 @@ typedef struct #define NB_HATCH_STYLES 6 -static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ); +static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ); static INT BRUSH_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static INT BRUSH_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static BOOL BRUSH_DeleteObject( HGDIOBJ handle, void *obj ); @@ -368,22 +368,26 @@ BOOL WINAPI FixBrushOrgEx( HDC hdc, INT x, INT y, LPPOINT oldorg ) /*********************************************************************** * BRUSH_SelectObject */ -static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ) +static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) { - BRUSHOBJ *brush = obj; - HGDIOBJ ret; - DC *dc = DC_GetDCPtr( hdc ); + BRUSHOBJ *brush; + HGDIOBJ ret = 0; + DC *dc = get_dc_ptr( hdc ); if (!dc) return 0; - if (brush->logbrush.lbStyle == BS_PATTERN) - BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, dc ); - - ret = dc->hBrush; - if (dc->funcs->pSelectBrush) handle = dc->funcs->pSelectBrush( dc->physDev, handle ); - if (handle) dc->hBrush = handle; - else ret = 0; - DC_ReleaseDCPtr( dc ); + if ((brush = GDI_GetObjPtr( handle, BRUSH_MAGIC ))) + { + if (brush->logbrush.lbStyle == BS_PATTERN) + BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, dc ); + + ret = dc->hBrush; + if (dc->funcs->pSelectBrush) handle = dc->funcs->pSelectBrush( dc->physDev, handle ); + if (handle) dc->hBrush = handle; + else ret = 0; + GDI_ReleaseObj( handle ); + } + release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4265ec9..f76af22 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -86,7 +86,7 @@ static inline INT INTERNAL_YWSTODS(DC *dc, INT height) return pt[1].y - pt[0].y; } -static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ); +static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ); static INT FONT_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static INT FONT_GetObjectA( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static INT FONT_GetObjectW( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); @@ -585,7 +585,7 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, * drivers that don't support vector fonts they must supply their own * font. */ -static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ) +static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) { HGDIOBJ ret = 0; DC *dc = DC_GetDCPtr( hdc ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 08ba02b..6ef0b66 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -71,7 +71,7 @@ typedef struct { struct gdi_obj_funcs { - HGDIOBJ (*pSelectObject)( HGDIOBJ handle, void *obj, HDC hdc ); + HGDIOBJ (*pSelectObject)( HGDIOBJ handle, HDC hdc ); INT (*pGetObject16)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); INT (*pGetObjectA)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); INT (*pGetObjectW)( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 0388c71..25f072c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1150,7 +1150,7 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ hObj ) { if (header->funcs && header->funcs->pSelectObject) { - ret = header->funcs->pSelectObject( hObj, header, hdc ); + ret = header->funcs->pSelectObject( hObj, hdc ); if (ret && ret != hObj && HandleToULong(ret) > COMPLEXREGION) { inc_ref_count( header ); diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index cc48e4d..1c4381e 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -42,7 +42,7 @@ typedef struct } PENOBJ; -static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ); +static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ); static INT PEN_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static INT PEN_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); @@ -215,7 +215,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, /*********************************************************************** * PEN_SelectObject */ -static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ) +static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) { HGDIOBJ ret; DC *dc = DC_GetDCPtr( hdc ); diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index b746447..3627ccb 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -120,7 +120,7 @@ typedef struct } RGNOBJ; -static HGDIOBJ REGION_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ); +static HGDIOBJ REGION_SelectObject( HGDIOBJ handle, HDC hdc ); static BOOL REGION_DeleteObject( HGDIOBJ handle, void *obj ); static const struct gdi_obj_funcs region_funcs = @@ -549,7 +549,7 @@ static BOOL REGION_DeleteObject( HGDIOBJ handle, void *obj ) /*********************************************************************** * REGION_SelectObject */ -static HGDIOBJ REGION_SelectObject( HGDIOBJ handle, void *obj, HDC hdc ) +static HGDIOBJ REGION_SelectObject( HGDIOBJ handle, HDC hdc ) { return ULongToHandle(SelectClipRgn( hdc, handle )); }

1 0

Alexandre Julliard : gdi32: Move the object refcount handling to the SelectObject backend functions.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: af6c0a09c56770c903f21b65a637d6645502afca URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6c0a09c56770c903f21b65a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 20:57:02 2007 +0200 gdi32: Move the object refcount handling to the SelectObject backend functions. --- dlls/gdi32/bitmap.c | 2 ++ dlls/gdi32/brush.c | 10 +++++++--- dlls/gdi32/font.c | 2 ++ dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdiobj.c | 25 +++++++++++++------------ dlls/gdi32/pen.c | 13 +++++++++---- 6 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 0aa7dd5..e882442 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -593,9 +593,11 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) if (handle) { dc->hBitmap = handle; + GDI_inc_ref_count( handle ); dc->dirty = 0; SetRectRgn( dc->hVisRgn, 0, 0, bitmap->bitmap.bmWidth, bitmap->bitmap.bmHeight); DC_InitDC( dc ); + GDI_dec_ref_count( ret ); } else ret = 0; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 4b13bc0..ac5ae77 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -381,10 +381,14 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) if (brush->logbrush.lbStyle == BS_PATTERN) BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, dc ); - ret = dc->hBrush; if (dc->funcs->pSelectBrush) handle = dc->funcs->pSelectBrush( dc->physDev, handle ); - if (handle) dc->hBrush = handle; - else ret = 0; + if (handle) + { + ret = dc->hBrush; + dc->hBrush = handle; + GDI_inc_ref_count( handle ); + GDI_dec_ref_count( ret ); + } GDI_ReleaseObj( handle ); } release_dc_ptr( dc ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f76af22..826e331 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -608,6 +608,8 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc ) { ret = dc->hFont; dc->hFont = handle; + GDI_inc_ref_count( handle ); + GDI_dec_ref_count( ret ); } DC_ReleaseDCPtr( dc ); return ret; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6ef0b66..421e7c5 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -456,6 +456,8 @@ extern BOOL GDI_FreeObject( HGDIOBJ, void *obj ); extern void *GDI_GetObjPtr( HGDIOBJ, WORD ); extern void GDI_ReleaseObj( HGDIOBJ ); extern void GDI_CheckNotLock(void); +extern BOOL GDI_inc_ref_count( HGDIOBJ handle ); +extern BOOL GDI_dec_ref_count( HGDIOBJ handle ); extern BOOL GDI_hdc_using_object(HGDIOBJ obj, HDC hdc); extern BOOL GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc); diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 25f072c..9539d61 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -524,22 +524,29 @@ static DWORD get_dpi( void ) /*********************************************************************** - * inc_ref_count + * GDI_inc_ref_count * * Increment the reference count of a GDI object. */ -static inline void inc_ref_count( GDIOBJHDR *header ) +BOOL GDI_inc_ref_count( HGDIOBJ handle ) { - header->dwCount++; + GDIOBJHDR *header; + + if ((header = GDI_GetObjPtr( handle, MAGIC_DONTCARE ))) + { + header->dwCount++; + GDI_ReleaseObj( handle ); + } + return header != NULL; } /*********************************************************************** - * dec_ref_count + * GDI_dec_ref_count * * Decrement the reference count of a GDI object. */ -static inline void dec_ref_count( HGDIOBJ handle ) +BOOL GDI_dec_ref_count( HGDIOBJ handle ) { GDIOBJHDR *header; @@ -556,6 +563,7 @@ static inline void dec_ref_count( HGDIOBJ handle ) DeleteObject( handle ); } } + return header != NULL; } @@ -1149,14 +1157,7 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ hObj ) if (header) { if (header->funcs && header->funcs->pSelectObject) - { ret = header->funcs->pSelectObject( hObj, hdc ); - if (ret && ret != hObj && HandleToULong(ret) > COMPLEXREGION) - { - inc_ref_count( header ); - dec_ref_count( ret ); - } - } GDI_ReleaseObj( hObj ); } } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 1c4381e..5647d7e 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -217,14 +217,19 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, */ static HGDIOBJ PEN_SelectObject( HGDIOBJ handle, HDC hdc ) { - HGDIOBJ ret; + HGDIOBJ ret = 0; DC *dc = DC_GetDCPtr( hdc ); if (!dc) return 0; - ret = dc->hPen; + if (dc->funcs->pSelectPen) handle = dc->funcs->pSelectPen( dc->physDev, handle ); - if (handle) dc->hPen = handle; - else ret = 0; + if (handle) + { + ret = dc->hPen; + dc->hPen = handle; + GDI_inc_ref_count( handle ); + GDI_dec_ref_count( ret ); + } DC_ReleaseDCPtr( dc ); return ret; }

1 0

Alexandre Julliard : gdi32: Fix typo in FIXME (spotted by Rob Shearman).
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: 161821155d1e3e491f63a017d5fdcd9ea1e43339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161821155d1e3e491f63a017d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 18:05:57 2007 +0200 gdi32: Fix typo in FIXME (spotted by Rob Shearman). --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3ec28f9..6036f48 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5062,7 +5062,7 @@ BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) { - FIXME("(%p, %p): stub\n", hdc, glyphset); + FIXME("(%p, %p): stub\n", font, glyphset); return 0; }

1 0

Andrew Talbot : gdiplus: Fix some memory leaks.
by Alexandre Julliard 27 Sep '07

27 Sep '07

Module: wine Branch: master Commit: dfac0635f65c07e4f45106395aacbcce8819073f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfac0635f65c07e4f45106395… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 25 20:52:58 2007 +0100 gdiplus: Fix some memory leaks. --- dlls/gdiplus/graphics.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3072b50..c69c0e5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1418,6 +1418,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string break; } + GdipFree(stringdup); DeleteObject(rgn); DeleteObject(gdifont); @@ -1827,6 +1828,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, bounds->Width = (REAL)max_width; bounds->Height = (REAL) min(height, nheight); + GdipFree(stringdup); DeleteObject(SelectObject(graphics->hdc, oldfont)); return Ok;

1 0