October 2007 - Wine-commits

Alexandre Julliard : winex11: Set the SKIP_PAGER and SKIP_TASKBAR styles on tool windows.
by Alexandre Julliard 11 Oct '07

11 Oct '07

Module: wine Branch: master Commit: a0019801eb51f77bd2e1e8af499e466cbd84db79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0019801eb51f77bd2e1e8af4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 11 11:40:55 2007 +0200 winex11: Set the SKIP_PAGER and SKIP_TASKBAR styles on tool windows. --- dlls/winex11.drv/winpos.c | 8 +++++++- dlls/winex11.drv/x11drv.h | 4 ++++ dlls/winex11.drv/x11drv_main.c | 2 ++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index e75d8f6..71c05f5 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -181,9 +181,11 @@ static void update_wm_states( Display *display, struct x11drv_win_data *data, BO static const unsigned int state_atoms[NB_WM_STATES] = { XATOM__NET_WM_STATE_FULLSCREEN, + XATOM__NET_WM_STATE_SKIP_PAGER, + XATOM__NET_WM_STATE_SKIP_TASKBAR }; - DWORD i, new_state = 0; + DWORD i, ex_style, new_state = 0; XEvent xev; if (!data->managed) return; @@ -192,6 +194,10 @@ static void update_wm_states( Display *display, struct x11drv_win_data *data, BO data->client_rect.top <= 0 && data->client_rect.bottom >= screen_height) new_state |= (1 << WM_STATE_FULLSCREEN); + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + if (ex_style & WS_EX_TOOLWINDOW) + new_state |= (1 << WM_STATE_SKIP_TASKBAR) | (1 << WM_STATE_SKIP_PAGER); + xev.xclient.type = ClientMessage; xev.xclient.window = data->whole_window; xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3e63d2f..cba5c71 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -579,6 +579,8 @@ enum x11drv_atoms XATOM__NET_WM_PING, XATOM__NET_WM_STATE, XATOM__NET_WM_STATE_FULLSCREEN, + XATOM__NET_WM_STATE_SKIP_PAGER, + XATOM__NET_WM_STATE_SKIP_TASKBAR, XATOM__NET_WM_WINDOW_TYPE, XATOM__NET_WM_WINDOW_TYPE_DIALOG, XATOM__NET_WM_WINDOW_TYPE_NORMAL, @@ -647,6 +649,8 @@ enum x11drv_window_messages enum x11drv_wm_state { WM_STATE_FULLSCREEN, + WM_STATE_SKIP_PAGER, + WM_STATE_SKIP_TASKBAR, NB_WM_STATES }; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index f56d4e2..1cfc0b0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -136,6 +136,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_WM_PING", "_NET_WM_STATE", "_NET_WM_STATE_FULLSCREEN", + "_NET_WM_STATE_SKIP_PAGER", + "_NET_WM_STATE_SKIP_TASKBAR", "_NET_WM_WINDOW_TYPE", "_NET_WM_WINDOW_TYPE_DIALOG", "_NET_WM_WINDOW_TYPE_NORMAL",

1 0

Alexandre Julliard : winex11: Reuse the mwm hints when computing the window X11 rectangle.
by Alexandre Julliard 11 Oct '07

11 Oct '07

Module: wine Branch: master Commit: c4e20e7462f40887d9845caed0ae32949711b83b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e20e7462f40887d9845caed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 11 12:24:27 2007 +0200 winex11: Reuse the mwm hints when computing the window X11 rectangle. This allows more flexibility in deciding which elements of the decor are done by the window manager. --- dlls/winex11.drv/window.c | 88 ++++++++++++++++++++++++++++++-------------- 1 files changed, 60 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5c4eead..65baee3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -129,6 +129,58 @@ BOOL X11DRV_is_window_rect_mapped( const RECT *rect ) /*********************************************************************** + * get_mwm_decorations + */ +static unsigned long get_mwm_decorations( DWORD style, DWORD ex_style ) +{ + unsigned long ret = 0; + + if (ex_style & WS_EX_TOOLWINDOW) return 0; + + if ((style & WS_CAPTION) == WS_CAPTION) + { + ret |= MWM_DECOR_TITLE | MWM_DECOR_BORDER; + if (style & WS_SYSMENU) ret |= MWM_DECOR_MENU; + if (style & WS_MINIMIZEBOX) ret |= MWM_DECOR_MINIMIZE; + if (style & WS_MAXIMIZEBOX) ret |= MWM_DECOR_MAXIMIZE; + } + if (ex_style & WS_EX_DLGMODALFRAME) ret |= MWM_DECOR_BORDER; + else if (style & WS_THICKFRAME) ret |= MWM_DECOR_BORDER | MWM_DECOR_RESIZEH; + else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) ret |= MWM_DECOR_BORDER; + else if (style & WS_BORDER) ret |= MWM_DECOR_BORDER; + else if (!(style & (WS_CHILD|WS_POPUP))) ret |= MWM_DECOR_BORDER; + return ret; +} + + +/*********************************************************************** + * get_x11_rect_offset + * + * Helper for X11DRV_window_to_X_rect and X11DRV_X_to_window_rect. + */ +static void get_x11_rect_offset( struct x11drv_win_data *data, RECT *rect ) +{ + DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; + unsigned long decor; + + rect->top = rect->bottom = rect->left = rect->right = 0; + + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + decor = get_mwm_decorations( style, ex_style ); + + if (decor & MWM_DECOR_TITLE) style_mask |= WS_CAPTION; + if (decor & MWM_DECOR_BORDER) + { + style_mask |= WS_DLGFRAME | WS_THICKFRAME; + ex_style_mask |= WS_EX_DLGMODALFRAME; + } + + AdjustWindowRectEx( rect, style & style_mask, FALSE, ex_style & ex_style_mask ); +} + + +/*********************************************************************** * get_window_attributes * * Fill the window attributes structure for an X window. @@ -768,27 +820,12 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; + mwm_hints.decorations = get_mwm_decorations( style, ex_style ); mwm_hints.functions = MWM_FUNC_MOVE; if (style & WS_THICKFRAME) mwm_hints.functions |= MWM_FUNC_RESIZE; if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; - mwm_hints.decorations = 0; - if (!(ex_style & WS_EX_TOOLWINDOW)) - { - if ((style & WS_CAPTION) == WS_CAPTION) - { - mwm_hints.decorations |= MWM_DECOR_TITLE; - if (style & WS_SYSMENU) mwm_hints.decorations |= MWM_DECOR_MENU; - if (style & WS_MINIMIZEBOX) mwm_hints.decorations |= MWM_DECOR_MINIMIZE; - if (style & WS_MAXIMIZEBOX) mwm_hints.decorations |= MWM_DECOR_MAXIMIZE; - } - if (ex_style & WS_EX_DLGMODALFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER; - else if (style & WS_THICKFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER | MWM_DECOR_RESIZEH; - else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER; - else if (style & WS_BORDER) mwm_hints.decorations |= MWM_DECOR_BORDER; - else if (!(style & (WS_CHILD|WS_POPUP))) mwm_hints.decorations |= MWM_DECOR_BORDER; - } XChangeProperty( display, data->whole_window, x11drv_atom(_MOTIF_WM_HINTS), x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, @@ -862,17 +899,11 @@ void X11DRV_set_iconic_state( HWND hwnd ) void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) { RECT rc; - DWORD ex_style; if (!data->managed) return; if (IsRectEmpty( rect )) return; - ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - if (ex_style & WS_EX_TOOLWINDOW) return; - - rc.top = rc.bottom = rc.left = rc.right = 0; - AdjustWindowRectEx( &rc, GetWindowLongW( data->hwnd, GWL_STYLE ) & ~(WS_HSCROLL|WS_VSCROLL), - FALSE, ex_style ); + get_x11_rect_offset( data, &rc ); rect->left -= rc.left; rect->right -= rc.right; @@ -890,16 +921,17 @@ void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) */ void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) { - DWORD ex_style; + RECT rc; if (!data->managed) return; if (IsRectEmpty( rect )) return; - ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - if (ex_style & WS_EX_TOOLWINDOW) return; - AdjustWindowRectEx( rect, GetWindowLongW( data->hwnd, GWL_STYLE ) & ~(WS_HSCROLL|WS_VSCROLL), - FALSE, ex_style ); + get_x11_rect_offset( data, &rc ); + rect->left += rc.left; + rect->right += rc.right; + rect->top += rc.top; + rect->bottom += rc.bottom; if (rect->top >= rect->bottom) rect->bottom = rect->top + 1; if (rect->left >= rect->right) rect->right = rect->left + 1; }

1 0

Detlef Riekenberg : wininet/tests: Initial tests for InternetCanonicalizeUrlA.
by Alexandre Julliard 11 Oct '07

11 Oct '07

Module: wine Branch: master Commit: f98b4507bafa4f96d92ec6fed3a0abcf16f41c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98b4507bafa4f96d92ec6fed… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 10 23:16:51 2007 +0200 wininet/tests: Initial tests for InternetCanonicalizeUrlA. --- dlls/wininet/tests/internet.c | 69 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index aa96391..2869cd1 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -27,7 +27,69 @@ #include "wine/test.h" -static void InternetQueryOptionA_test(void) +/* ############################### */ + +static void test_InternetCanonicalizeUrlA(void) +{ + CHAR buffer[256]; + LPCSTR url; + DWORD urllen; + DWORD dwSize; + DWORD res; + + /* Acrobat Updater 5 calls this for Adobe Reader 8.1 */ + url = "http://swupmf.adobe.com/manifest/50/win/AdobeUpdater.upd"; + urllen = lstrlenA(url); + + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + dwSize = 1; /* Acrobat Updater use this size */ + SetLastError(0xdeadbeef); + res = InternetCanonicalizeUrlA(url, buffer, &dwSize, 0); + todo_wine + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (dwSize == (urllen+1)), + "got %u and %u with size %u for '%s' (%d)\n", + res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + + + /* buffer has no space for the terminating '\0' */ + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + dwSize = urllen; + SetLastError(0xdeadbeef); + res = InternetCanonicalizeUrlA(url, buffer, &dwSize, 0); + /* dwSize is nr. of needed bytes with the terminating '\0' */ + todo_wine + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (dwSize == (urllen+1)), + "got %u and %u with size %u for '%s' (%d)\n", + res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + + /* buffer has the required size */ + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + dwSize = urllen+1; + SetLastError(0xdeadbeef); + res = InternetCanonicalizeUrlA(url, buffer, &dwSize, 0); + /* dwSize is nr. of copied bytes without the terminating '\0' */ + ok( res && (dwSize == urllen) && (lstrcmpA(url, buffer) == 0), + "got %u and %u with size %u for '%s' (%d)\n", + res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); + + /* buffer is larger as the required size */ + memset(buffer, '#', sizeof(buffer)-1); + buffer[sizeof(buffer)-1] = '\0'; + dwSize = urllen+2; + SetLastError(0xdeadbeef); + res = InternetCanonicalizeUrlA(url, buffer, &dwSize, 0); + /* dwSize is nr. of copied bytes without the terminating '\0' */ + ok( res && (dwSize == urllen) && (lstrcmpA(url, buffer) == 0), + "got %u and %u with size %u for '%s' (%d)\n", + res, GetLastError(), dwSize, buffer, lstrlenA(buffer)); +} + +/* ############################### */ + +static void test_InternetQueryOptionA(void) { HINTERNET hinet,hurl; DWORD len; @@ -221,9 +283,12 @@ static void test_null(void) } +/* ############################### */ + START_TEST(internet) { - InternetQueryOptionA_test(); + test_InternetCanonicalizeUrlA(); + test_InternetQueryOptionA(); test_get_cookie(); test_null(); }

1 0

Nigel Liang : include/winsock.h: Fix parenthesis mismatch.
by Alexandre Julliard 11 Oct '07

11 Oct '07

Module: wine Branch: master Commit: c31faf499156a631fedcc30015d94adb6a3d1617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31faf499156a631fedcc3001… Author: Nigel Liang <ncliang(a)gmail.com> Date: Wed Oct 10 17:25:51 2007 -0700 include/winsock.h: Fix parenthesis mismatch. --- include/winsock.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index d6f845b..fe86791 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -498,7 +498,7 @@ typedef struct WS(timeval) #else #define WS_FD_CLR(fd, set) __WS_FD_CLR((fd),(set), WS_fd_set) #define WS_FD_SET(fd, set) __WS_FD_SET((fd),(set), WS_fd_set) -#define WS_FD_ZERO(set) ((WS_fd_set*)(set))->fd_count=0) +#define WS_FD_ZERO(set) (((WS_fd_set*)(set))->fd_count=0) #define WS_FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)(fd), (WS_fd_set*)(set)) #endif

1 0

Chris Robinson : wined3d: Set D3DCAPS2_CANAUTOGENMIPMAP flag when supported .
by Alexandre Julliard 11 Oct '07

11 Oct '07

Module: wine Branch: master Commit: fc96587b3d4390f16f9c7d572e27ec950f715404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc96587b3d4390f16f9c7d572… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Oct 3 04:19:15 2007 -0700 wined3d: Set D3DCAPS2_CANAUTOGENMIPMAP flag when supported. --- dlls/wined3d/directx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1f9f1a1..6aadb70 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1992,6 +1992,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | WINED3DCAPS2_FULLSCREENGAMMA | WINED3DCAPS2_DYNAMICTEXTURES; + if(GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { + *pCaps->Caps2 |= WINED3DCAPS2_CANAUTOGENMIPMAP; + } *pCaps->Caps3 = WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD; *pCaps->PresentationIntervals = WINED3DPRESENT_INTERVAL_IMMEDIATE | WINED3DPRESENT_INTERVAL_ONE;

1 0

Dan Hipschman : rpcrt4, widl: Make pointer layouts compatible with windows; fix conformant array tests.
by Alexandre Julliard 11 Oct '07

11 Oct '07

Module: wine Branch: master Commit: acfde97b9ee3bd0df8d3bfc4a83ab538eb08b535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfde97b9ee3bd0df8d3bfc4a… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Oct 10 15:29:54 2007 -0700 rpcrt4, widl: Make pointer layouts compatible with windows; fix conformant array tests. --- dlls/rpcrt4/ndr_marshall.c | 59 ++++----------------- dlls/rpcrt4/tests/server.c | 76 ++++++++++++++++++++++++++- dlls/rpcrt4/tests/server.idl | 15 +++++ tools/widl/typegen.c | 119 +++++++++++++++++++++++------------------- 4 files changed, 164 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acfde97b9ee3bd0df8d3b…

1 0

Alexander Nicolaysen Sørnes : vote: Add support for deleting votes
by Chris Morgan 11 Oct '07

11 Oct '07

Module: appdb Branch: master Commit: 8d9cefe7b69a9cc7c87e51ad17408986e5304874 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8d9cefe7b69a9cc7c87e51ad… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 9 21:15:10 2007 +0200 vote: Add support for deleting votes --- include/vote.php | 38 +++++++++++++++++++++++++++++++++++++- unit_test/test_voting.php | 21 +++++++++++++++++---- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/include/vote.php b/include/vote.php index 32303da..e636571 100644 --- a/include/vote.php +++ b/include/vote.php @@ -55,6 +55,21 @@ class vote return TRUE; } + + public function delete() + { + /* A vote needs to have a versionId, so if it doesn't that means it is not in the + database or it was not selected in the vote editor */ + if(!$this->iVersionId) + return TRUE; + + $hResult = query_parameters("DELETE FROM appVotes WHERE id = '?'", $this->iVoteId); + + if(!$hResult) + return FALSE; + + return TRUE; + } } class voteManager @@ -82,7 +97,7 @@ class voteManager public function outputEditor($aClean = null) { - echo "The following shows your current votes. Check the boxes next to the apps you wish to replace with a vote for ".version::fullNameLink($aClean['iVersionId'])."."; + echo "The following shows your current votes. Check the boxes next to the apps you wish to replace with a vote for ".version::fullNameLink($aClean['iVersionId'])." or delete."; $oTable = new table(); $this->aVotes = $this->getVotes(); @@ -107,6 +122,11 @@ class voteManager return FALSE; } + function objectGetMail($sAction, $bMailSubmitter, $bParentAction) + { + return array(null, null, null); /* No mail */ + } + public function mustBeQueued() { return FALSE; @@ -127,6 +147,22 @@ class voteManager return TRUE; } + public function delete() + { + $bSuccess = TRUE; + + if(!is_array($this->aVotes)) + $this->aVotes = $this->getVotes(); + + foreach($this->aVotes as $oVote) + { + if(!$oVote->delete()) + $bSuccess = FALSE; + } + + return $bSuccess; + } + public function update() { foreach($this->aVotes as $oVote) diff --git a/unit_test/test_voting.php b/unit_test/test_voting.php index 9b882b3..efbc64e 100644 --- a/unit_test/test_voting.php +++ b/unit_test/test_voting.php @@ -23,7 +23,7 @@ function test_voteManager_getVotes() /* Tests that the votes are saved to the database and that we cannot create more than MAX_VOTES. Note that a user always has MAX_VOTES even though they're not in the DB, so we use update instead of create */ -function test_vote_update() +function test_vote_update_delete() { $iUserId = 655000; @@ -60,13 +60,26 @@ function test_vote_update() return FALSE; } - /* We don't normally delete votes, so we have to do it manually */ - query_parameters("DELETE FROM appVotes WHERE userId = '?'", $iUserId); + /* Now the entries should be gone again */ + $oVoteManager->delete(); + $iExpected = 0; + $iReceived = 0; /* Incremented below */ + foreach($oVoteManager->getVotes() as $oVote) + { + if($oVote->iVoteId) + $iReceived++; + } + + if($iExpected != $iReceived) + { + echo "Expected $iExpected votes after deletion, got $iReceived\n"; + return FALSE; + } return TRUE; } run_test("test_voteManager_getVotes"); -run_test("test_vote_update"); +run_test("test_vote_update_delete"); ?> \ No newline at end of file

1 0

Mikolaj Zalewski : oleaut32: Function kind for dispatch interfaces should be FUNC_DISPATCH.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: bda66cc37ab428c9f5f14d136a3de5f8b4dd235e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda66cc37ab428c9f5f14d136… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Fri Oct 5 15:55:56 2007 -0700 oleaut32: Function kind for dispatch interfaces should be FUNC_DISPATCH. --- .gitignore | 1 + dlls/oleaut32/tests/Makefile.in | 5 +- dlls/oleaut32/tests/test_tlb.idl | 39 ++++ dlls/oleaut32/tests/typelib.c | 448 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 2 + 5 files changed, 494 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bda66cc37ab428c9f5f14…

1 0

Andrew Talbot : wineps.drv: Fix some memory leaks.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: a76d10d1d9499fc9ed1184c980ba88db182c3342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76d10d1d9499fc9ed1184c98… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Oct 10 19:57:29 2007 +0100 wineps.drv: Fix some memory leaks. --- dlls/wineps.drv/init.c | 1 + dlls/wineps.drv/type42.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0d1ddd1..0c4f539 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -629,6 +629,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name) value_name=NULL; } if (value_name) { + HeapFree(PSDRV_Heap, 0, ppdFileName); ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); RegQueryValueExA(hkey, value_name, 0, &ppdType, (LPBYTE)ppdFileName, &needed); } diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index 454d9b3..6031366 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -314,9 +314,6 @@ BOOL T42_download_glyph(PSDRV_PDEVICE *physDev, DOWNLOAD *pdl, DWORD index, t42->glyph_sent_size * sizeof(*(t42->glyph_sent))); } - buf = HeapAlloc(GetProcessHeap(), 0, sizeof(glyph_def) + - strlen(pdl->ps_name) + 100); - if(!get_glyf_pos(t42, index, &start, &end)) return FALSE; TRACE("start = %x end = %x\n", start, end); @@ -352,6 +349,10 @@ BOOL T42_download_glyph(PSDRV_PDEVICE *physDev, DOWNLOAD *pdl, DWORD index, for(i = 1; t42->glyf_blocks[i]; i++) if(start < t42->glyf_blocks[i]) break; + + buf = HeapAlloc(GetProcessHeap(), 0, sizeof(glyph_def) + + strlen(pdl->ps_name) + 100); + /* we don't have a string for the gdir and glyf tables, but we do have a string for the TT header. So the offset we need is tables - 2 */ sprintf(buf, "%d %d\n", t42->num_of_written_tables - 2 + i, start - t42->glyf_blocks[i-1]);

1 0

H. Verbeet : d3d9: Release pixel shaders after we' re done with them in the visual test.
by Alexandre Julliard 10 Oct '07

10 Oct '07

Module: wine Branch: master Commit: 3587dfeb48ec0b88efb825dc614a550a66c86716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3587dfeb48ec0b88efb825dc6… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Oct 10 18:35:54 2007 +0200 d3d9: Release pixel shaders after we're done with them in the visual test. --- dlls/d3d9/tests/visual.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b376e9d..5ebd061 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2567,8 +2567,11 @@ static void texdepth_test(IDirect3DDevice9 *device) color = getPixelColor(device, 638, 240); ok(color == 0x000000ff, "Pixel 638(100%% + 2 pixel) has color %08x, expected 0x000000ff\n", color); + /* Cleanup */ hr = IDirect3DDevice9_SetPixelShader(device, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed (%08x)\n", hr); + IDirect3DPixelShader9_Release(shader); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); @@ -2722,6 +2725,11 @@ static void texkill_test(IDirect3DDevice9 *device) ok(color == 0x00ffff00, "Pixel 578/49 has color %08x, expected 0x00ffff00\n", color); color = getPixelColor(device, 575, 430); ok(color == 0x000000ff, "Pixel 575/49 has color %08x, expected 0x000000ff\n", color); + + /* Cleanup */ + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "SetPixelShader failed (%08x)\n", hr); + IDirect3DPixelShader9_Release(shader); } static void x8l8v8u8_test(IDirect3DDevice9 *device)

1 0