December 2007 - Wine-Commits

Rob Shearman : rpcrt4: Flesh out more of the IRpcChannelBuffer vtable to make the test_delegating_Invoke test succeed on Windows .
by Alexandre Julliard Dec. 4, 2007

Dec. 4, 2007

Module: wine Branch: master Commit: f191f59ee49be45aab8b41d8092b3e990c1df31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f191f59ee49be45aab8b41d80… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 3 16:08:28 2007 +0000 rpcrt4: Flesh out more of the IRpcChannelBuffer vtable to make the test_delegating_Invoke test succeed on Windows. --- dlls/rpcrt4/tests/cstub.c | 67 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 57 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index ef0c156..6a38397 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -836,7 +836,25 @@ static ITypeLibVtbl delegating_invoke_test_obj_vtbl = NULL }; -static HRESULT WINAPI delegating_invoke_test_get_buffer(IRpcChannelBuffer *pchan, +static HRESULT WINAPI delegating_invoke_chan_query_interface(IRpcChannelBuffer *pchan, + REFIID iid, + void **ppv) +{ + ok(0, "call to QueryInterface not expected\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI delegating_invoke_chan_add_ref(IRpcChannelBuffer *pchan) +{ + return 2; +} + +static ULONG WINAPI delegating_invoke_chan_release(IRpcChannelBuffer *pchan) +{ + return 1; +} + +static HRESULT WINAPI delegating_invoke_chan_get_buffer(IRpcChannelBuffer *pchan, RPCOLEMESSAGE *msg, REFIID iid) { @@ -844,16 +862,46 @@ static HRESULT WINAPI delegating_invoke_test_get_buffer(IRpcChannelBuffer *pchan return S_OK; } +static HRESULT WINAPI delegating_invoke_chan_send_receive(IRpcChannelBuffer *pchan, + RPCOLEMESSAGE *pMessage, + ULONG *pStatus) +{ + ok(0, "call to SendReceive not expected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI delegating_invoke_chan_free_buffer(IRpcChannelBuffer *pchan, + RPCOLEMESSAGE *pMessage) +{ + ok(0, "call to FreeBuffer not expected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI delegating_invoke_chan_get_dest_ctx(IRpcChannelBuffer *pchan, + DWORD *pdwDestContext, + void **ppvDestContext) +{ + *pdwDestContext = MSHCTX_LOCAL; + *ppvDestContext = NULL; + return S_OK; +} + +static HRESULT WINAPI delegating_invoke_chan_is_connected(IRpcChannelBuffer *pchan) +{ + ok(0, "call to IsConnected not expected\n"); + return E_NOTIMPL; +} + static IRpcChannelBufferVtbl delegating_invoke_test_rpc_chan_vtbl = { - NULL, - NULL, - NULL, - delegating_invoke_test_get_buffer, - NULL, - NULL, - NULL, - NULL + delegating_invoke_chan_query_interface, + delegating_invoke_chan_add_ref, + delegating_invoke_chan_release, + delegating_invoke_chan_get_buffer, + delegating_invoke_chan_send_receive, + delegating_invoke_chan_free_buffer, + delegating_invoke_chan_get_dest_ctx, + delegating_invoke_chan_is_connected }; static void test_delegating_Invoke(IPSFactoryBuffer *ppsf) @@ -869,7 +917,6 @@ static void test_delegating_Invoke(IPSFactoryBuffer *ppsf) memset(&msg, 0, sizeof(msg)); msg.dataRepresentation = NDR_LOCAL_DATA_REPRESENTATION; msg.iMethod = 3; - /* FIXME: Figure out why this fails on Windows */ r = IRpcStubBuffer_Invoke(pstub, &msg, pchan); ok(r == S_OK, "ret %08x\n", r); if(r == S_OK)

1 0

Alexander Nicolaysen Sørnes : preferences: Fix display of real name
by Chris Morgan Dec. 4, 2007

Dec. 4, 2007

Module: appdb Branch: master Commit: b9577f0815c6e5f4f9771b5cfd8856b93aafb2c9 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b9577f0815c6e5f4f9771b5c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Dec 4 02:04:47 2007 +0100 preferences: Fix display of real name --- include/form_edit.php | 2 +- preferences.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/form_edit.php b/include/form_edit.php index 74d4b44..099c008 100644 --- a/include/form_edit.php +++ b/include/form_edit.php @@ -6,7 +6,7 @@ require_once(BASE."include/util.php"); /*********************/ // returns an array of TableRow instances -function GetEditAccountFormRows($sUserEmail) +function GetEditAccountFormRows($sUserEmail, $sUserRealname) { $aTableRows = array(); diff --git a/preferences.php b/preferences.php index 743cff9..7050343 100644 --- a/preferences.php +++ b/preferences.php @@ -201,7 +201,7 @@ $oTable->SetCellSpacing(0); $oTable->SetClass("box-body"); // retrieve the form editing rows -$aTableRows = GetEditAccountFormRows($oUser->sEmail); +$aTableRows = GetEditAccountFormRows($oUser->sEmail, $oUser->sRealname); foreach($aTableRows as $oTableRow) $oTable->AddRow($oTableRow);

1 0

Zachary Goldberg : Fwd: Wine Weekly Newsletter
by Jeremy Newman Dec. 3, 2007

Dec. 3, 2007

Module: website Branch: master Commit: 5d77e2fd6ee96ab250d128326a9790336306acc5 URL: http://source.winehq.org/git/website.git/?a=commit;h=5d77e2fd6ee96ab250d128… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Dec 3 00:22:08 2007 -0500 Fwd: Wine Weekly Newsletter Jeremy, Attached is the output of the command "git diff origin". Please let me know if this will work for you. Thanks very much! --Zach On Nov 30, 2007 2:08 PM, Zachary Goldberg <zgs(a)seas.upenn.edu> wrote: > Sounds good to me :) > > > On Nov 30, 2007 1:45 PM, Jeremy Newman <jnewman(a)codeweavers.com> wrote: > > OK, I may not get to apply it until Monday morning. I usually only apply > > patches when I'm in the office. 9-5 CST M-F > > > > > > Zachary Goldberg wrote: > > > Aha! Found the other git tree, website.git. Will send you a patch > > > sunday night? > > > > > > On Nov 30, 2007 12:11 PM, Zachary Goldberg <zgs(a)seas.upenn.edu> wrote: > > >> Jeremy, > > >> > > >> So I'm cloning the git tree to my local pc as we speak. I'm guessing > > >> that WineHQ itself is in the git somewhere, i'll commit my new files > > >> and then email you a patch? > > >> > > >> --Zach > > >> > > >> > > >> > > >> On Nov 27, 2007 10:25 AM, Jeremy Newman <jnewman(a)codeweavers.com> wrote: > > >>> Hello Zack, good to have someone taking on this task. > > >>> > > >>> Brian did most of the grunt work on this. I simply applied his patches > > >>> to my working tree, and did a simple check to make sure the XML was > > >>> valid. If it looked OK, I committed it. > > >>> > > >>> These days we have switched the Website over to Git. I usually will only > > >>> accept patches in git format. You may want to read up on the Wiki on how > > >>> to use Git. Since you are new to this gig, I will accept new issues just > > >>> as they are. > > >>> > > >>> Feel free to ask questions, I will help in any way that I can. > > >>> > > >>> -newman > > >>> > > >>> > > >>> Zachary Goldberg wrote: > > >>>> Mr. Newman, > > >>>> > > >>>> Hi, I'm Zach. I've been in contact with Brian Vincent a bit these > > >>>> past few days and I've begun working on the WWN again. Just wanted to > > >>>> give you a heads up that the project has been picked up again. I > > >>>> expect to have a finished XML file for publishing for next Monday > > >>>> covering the past 2 weeks of devel (ish). In the future it was > > >>>> proposed to have a 'big wwn' to cover the lapsed months. The purpose > > >>>> of this email is just to touch base with you; let you know that stuff > > >>>> is going on and to request any information you may have that might be > > >>>> helpful in the writing or publishing process. > > >>>> > > >>>> Thanks, > > >>>> Zach > > >>>> > > >>>> > > >>>> ---------- Forwarded message ---------- > > >>>> From: Brian Vincent <brian.vincent(a)gmail.com> > > >>>> Date: Nov 22, 2007 8:42 PM > > >>>> Subject: Re: Wine Weekly Newsletter > > >>>> To: Zachary Goldberg <zgs(a)seas.upenn.edu> > > >>>> Cc: Alex Waite <awaite2(a)uiuc.edu> > > >>>> > > >>>> > > >>>> I finally got around to writing this and its a lot of random thoughts: > > >>>> > > >>>> 1. The writing is simple. It's the markup that takes time. I used > > >>>> to use some vi macros for it (I lost them, so they won't be of any > > >>>> help.) > > >>>> > > >>>> 2. Legal stuff.. this one is kind of tricky, but it's rather > > >>>> important. Wine walks a tightrope of legality and the sharks swimming > > >>>> underneath are a bunch of lawyers in Redmond. Make no mistake about > > >>>> it, there's a lot of Wine developers who worry about Microsoft. Now, > > >>>> Alexandre and Jeremy have done a fine, fine job of making sure the > > >>>> project doesn't infringe on any copyrights or violate the DMCA, etc. > > >>>> However, there's been developers in the past and there will be more in > > >>>> the future who are going to break the law. Maybe they'll copy > > >>>> Microsoft source code, maybe they'll disassemble code, or something > > >>>> else. These issues get brought up on the mailing list from time to > > >>>> time and sometimes even result in heated debate. Don't write about > > >>>> them. Please. Yes they're on a public mailing list, but the dirty > > >>>> laundry doesn't need to be aired in WWN. There was something in the > > >>>> draft thing Zach did similar to this. > > >>>> > > >>>> 3. CodeWeavers really is a godsend for Wine. If it wasn't for them > > >>>> the project would have gone nowhere a long time ago. Plus, Jeremy and > > >>>> company are just a genuinely nice group of people. I always tried to > > >>>> give them as much credit as they deserve. > > >>>> > > >>>> 4. Write every day. I can't stress this enough. Don't try to sit > > >>>> down and do a whole WWN at once. This is hard at first because you > > >>>> don't know which threads to pick. Later it gets easier because you > > >>>> can tell right from the first post which threads will go in WWN for > > >>>> the week and you can add to them slowly over a series of days. > > >>>> > > >>>> 5. Picking threads - it takes a while to figure out which threads to > > >>>> write about. Don't worry so much about it. Covering any thread is > > >>>> better than covering no threads. > > >>>> > > >>>> 6. Be wary of any thread on the mailing list by someone new who says > > >>>> something like, "I'm going to start working on Wine and I'm going to > > >>>> implement .Net". Big boasts often don't come true. This used to be > > >>>> much more of problem than it is now. > > >>>> > > >>>> 7. Zach Brown used to run Kernel Traffic (kerneltraffic.org) and I'd > > >>>> mail him each WWN for posting on that site as well. I don't think too > > >>>> many people read that site any more so I'm not sure how important that > > >>>> is. For that reason, you might want to consider dropping the <topic> > > >>>> tag. > > >>>> > > >>>> 8. You don't need to include every sentence of every post. There's > > >>>> more than a few times where I'd whittle a multi-paragraph email down > > >>>> to one sentence. > > >>>> > > >>>> 9. Alexandre writes extremely dense sentences. If he responds to a > > >>>> post, read it carefully because there's a good chance they're the two > > >>>> most important sentences in a thread. > > >>>> > > >>>> 10. I almost never rewrote anyone's posts. Keep in mind the English > > >>>> isn't the first language for most of Wine's developers. Some > > >>>> developers have excellent English while others don't. Only in a few > > >>>> extreme cases did I rewrite a sentence because I knew the developer > > >>>> didn't say what he meant to say. Early on I didn't correct spelling > > >>>> mistakes, later I started correcting the glaring errors. Francois > > >>>> Gouget will fix all the spelling problems for you anyway. > > >>>> > > >>>> 11. Jeremy Newman is the webmaster for WineHQ. He can answer lots of > > >>>> questions you might run into. jnewman(a)codeweavers.com > > >>>> > > >>>> 12. Fridays are a great day to finish to finish an issue but a lousy > > >>>> day to publish one. The mailing list is very much a Monday - Friday > > >>>> thing. Many threads start on a Monday and wrap up by the end of the > > >>>> week. It's really weird how regular that is. Friday sucks as a day > > >>>> to publish because less people will read that issue of WWN. You get a > > >>>> lot more readership if you publish on a Monday or a Thursday. I > > >>>> always found those days work best. > > >>>> > > >>>> 13. Keep in mind what you're doing really has the potential to bring > > >>>> in $$$ and new developers to the project. I used to always highlight > > >>>> threads that talked about projects that needed to be done. More than > > >>>> once someone would read WWN and think, "I know how to work on > > >>>> something like that, maybe I can contribute to the project." > > >>>> > > >>>> 14. WWN seems really thankless and it's easy to get disillusioned > > >>>> that no one reads it. It took me quite a few years to realize a lot > > >>>> of people really appreciate it. Most of the developers read it every > > >>>> week even though they're on the mailing list. > > >>>> > > >>>> 15. It would be easy to collaborate on a WWN issue by simply letting > > >>>> different people write different <section>'s each week. However, I > > >>>> had an idea - is there a way to use Google Docs to collaborate on such > > >>>> a thing? > > >>>> > > >>>> Now for the nitty gritty on how I'd actually write an issue: > > >>>> > > >>>> 1. I'd write each <section> separately and store them in separate > > >>>> files. Look at the XML source and that'll make sense. Remember when > > >>>> I said all the work was in the markup? > > >>>> > > >>>> 2. Then at the end of the week I'd run a script that downloaded the > > >>>> mailing list, created the stats, and built the header for the XML > > >>>> file. It also tried to find some of the duplicate names in the stats > > >>>> and alert me to them as well as convert the Unicode names to ANSI. > > >>>> > > >>>> 3. I'd usually write the first <section>, the News section, toward > > >>>> the end of the week. It used to be fairly time consuming combing > > >>>> sites for news about Wine. It's a lot easier now - just go to Google > > >>>> News and search for "Wine Linux". It'll turn up everything you want > > >>>> to cover. > > >>>> > > >>>> 4. Then I'd cat header file with all the <section> files. I'd run > > >>>> the whole thing first through a program called 'tidy' to check if the > > >>>> XML was malformed. Then I'd run it all through xmllint after those > > >>>> mistakes were fixed. tidy gives easier to read output compared to > > >>>> xmllint. However, xmllint is extremely strict and follows the same > > >>>> standards required by the backend on WineHQ. > > >>>> > > >>>> 5. All of WineHQ used to reside in CVS. Now it's in git. So I > > >>>> really can't help you with how to commit to that because I never have. > > >>>> Ask jnewman(a)codeweavers.com for details. I used to directly commit > > >>>> to CVS, I'm sure the same can be done with git. > > >>>> > > >>>> 6. A lot of times I'd start the next issue before the current one was > > >>>> even out. It's useful to wait for threads to wrap up. > > >>>> > > >>>> 7. I'll send another email from my shell account with all the scripts > > >>>> I used to generate stats and build the XML header. > > >>>> > > >>>> -Brian > > >>>> > > >>>> > > >>>> On 10/26/07, Zachary Goldberg <zgs(a)seas.upenn.edu> wrote: > > >>>> > > >>>>> Alex, > > >>>>> > > >>>>> Attached is ~20 minutes of working crawling this month's devel list > > >>>>> serv. Let me know your thoughts. > > >>>>> > > >>>>> --Zach > > >>>>> > > >>>>> On 10/26/07, Alex Waite <awaite2(a)uiuc.edu> wrote: > > >>>>> > > >>>>>> Sounds good to me. And don't worry, I understand what life is like in > > >>>>>> college; I'm a current student. We'll cover October and then proceed > > >>>>>> from there. > > >>>>>> > > >>>>>> ---Alex > > >>>>>> > > >>>>>> Zachary Goldberg wrote: > > >>>>>> > > >>>>>>> I completely agree and was contemplating this as I wrote my last e-mail. > > >>>>>>> > > >>>>>>> While I do see the value in covering all important things, I think > > >>>>>>> given that none of us has infinite time (even though you may think > > >>>>>>> college kids do =P) a comprehensive WWN since may might be hard. > > >>>>>>> However I propose the following: > > >>>>>>> > > >>>>>>> We begin WWN with the month of october, then continue weekly from there. > > >>>>>>> > > >>>>>>> Somewhere down the road, within the next couple weeks, we release a > > >>>>>>> 'special edition' WWN which covers late May June July August and > > >>>>>>> September. > > >>>>>>> > > >>>>>>> --Zach > > >>>>>>> > > >>>>> -- > > >>>>> Zachary Goldberg > > >>>>> Computer Science Major > > >>>>> School of Engineering at the University of Pennsylvania > > >>>>> Philadelphia PA > > >>>>> > > >>>>> > > >>>>> > > >>>> > > >>>> > > >>>> > > >>> > > >> > > >> > > >> -- > > >> Zachary Goldberg > > >> Computer Science & Engineering > > >> Electrical Captain of Penn Electric Race Team > > >> > > >> School of Engineering at the University of Pennsylvania > > >> > > > > > > > > > > > > > > > -- > > Zachary Goldberg > Computer Science & Engineering > Electrical Captain of Penn Electric Race Team > School of Engineering at the University of Pennsylvania > -- Zachary Goldberg Computer Science & Engineering Electrical Captain of Penn Electric Race Team School of Engineering at the University of Pennsylvania --- news/200712301.xml | 7 + wwn/wn20071203_333.xml | 495 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 502 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=5d77e2fd6ee96ab250…

1 0

Jeremy Newman : force pre tags to wrap in various browsers, fixes issues with pre tags in wwn issues with long strings.
by Jeremy Newman Dec. 3, 2007

Dec. 3, 2007

Module: website Branch: master Commit: 537cd7cf2277ea10b4e83287e98d0fb1b895d900 URL: http://source.winehq.org/git/website.git/?a=commit;h=537cd7cf2277ea10b4e832… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 3 12:29:27 2007 -0600 force pre tags to wrap in various browsers, fixes issues with pre tags in wwn issues with long strings. --- winehq_styles.css | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/winehq_styles.css b/winehq_styles.css index 1f8241e..f9e024f 100644 --- a/winehq_styles.css +++ b/winehq_styles.css @@ -28,7 +28,12 @@ A.hidden { text-decoration: none; color: #000000; } OL,UL,P { font-size: 12px; } TD,TR,TH { font-size: 12px; } INPUT { font-size: 12px; } -PRE { font-family: monospace; font-size: 12px; } +PRE { + font-family: monospace; font-size: 12px; + white-space: pre-wrap; + white-space: -moz-pre-wrap !important; + word-wrap: break-word; + } /* Hn Sizes */ H1 { font-size: 180%; } @@ -147,4 +152,4 @@ p.indent { padding-left: 1em; padding-right: 1em;} /* App Support status */ .gold { background-color: wheat; } -.silver { background-color: silver; } \ No newline at end of file +.silver { background-color: silver; }

1 0

Alexandre Julliard : shell32: Get rid of the internal _InsertMenuItem function.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 7a4e3a1011032d61556d5a4c218f9bc0e775c236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4e3a1011032d61556d5a4c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 15:49:51 2007 +0100 shell32: Get rid of the internal _InsertMenuItem function. --- dlls/shell32/shell32_main.h | 3 --- dlls/shell32/shlview.c | 26 +++++++++++++++++++++----- dlls/shell32/shv_item_cmenu.c | 33 +-------------------------------- 3 files changed, 22 insertions(+), 40 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index a9e3156..cd48072 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -172,9 +172,6 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16,LPCSTR,UINT16,WORD); BOOL16 WINAPI ShellAbout16(HWND16,LPCSTR,LPCSTR,HICON16); BOOL16 WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM); -void WINAPI _InsertMenuItem (HMENU hmenu, UINT indexMenu, BOOL fByPosition, - UINT wID, UINT fType, LPCSTR dwTypeData, UINT fState); - static inline BOOL SHELL_OsIsUnicode(void) { /* if high-bit of version is 0, we are emulating NT */ diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 810c493..390fdc9 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -768,9 +768,21 @@ static void ShellView_MergeFileMenu(IShellViewImpl * This, HMENU hSubMenu) if(hSubMenu) { /*insert This item at the beginning of the menu */ - _InsertMenuItem(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItem(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, "dummy45", MFS_ENABLED); - + MENUITEMINFOA mii; + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_TYPE; + mii.wID = 0; + mii.fType = MFT_SEPARATOR; + InsertMenuItemA(hSubMenu, 0, TRUE, &mii); + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; + mii.dwTypeData = (LPSTR)"dummy45"; + mii.fState = MFS_ENABLED; + mii.wID = IDM_MYFILEITEM; + mii.fType = MFT_STRING; + InsertMenuItemA(hSubMenu, 0, TRUE, &mii); } TRACE("--\n"); } @@ -788,9 +800,13 @@ static void ShellView_MergeViewMenu(IShellViewImpl * This, HMENU hSubMenu) MENUITEMINFOA mii; static char view[] = "View"; - _InsertMenuItem(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); + ZeroMemory(&mii, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_TYPE; + mii.wID = 0; + mii.fType = MFT_SEPARATOR; + InsertMenuItemA(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii); - ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_SUBMENU | MIIM_TYPE | MIIM_DATA; mii.fType = MFT_STRING; diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 1cb60c5..b0ec250 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -177,38 +177,7 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) return refCount; } -/************************************************************************** -* ICM_InsertItem() -*/ -void WINAPI _InsertMenuItem ( - HMENU hmenu, - UINT indexMenu, - BOOL fByPosition, - UINT wID, - UINT fType, - LPCSTR dwTypeData, - UINT fState) -{ - MENUITEMINFOA mii; - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - if (fType == MFT_SEPARATOR) - { - mii.fMask = MIIM_ID | MIIM_TYPE; - } - else - { - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; - mii.dwTypeData = (LPSTR) dwTypeData; - mii.fState = fState; - } - mii.wID = wID; - mii.fType = fType; - InsertMenuItemA( hmenu, indexMenu, fByPosition, &mii); -} - -static void WINAPI _InsertMenuItemW ( +static void _InsertMenuItemW ( HMENU hmenu, UINT indexMenu, BOOL fByPosition,

1 0

Hans Leidekker : gdi32: Implement GetTextExtentExPointI.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 8487c2dd2a959cc80c0cc23ffbc67c977efbe2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8487c2dd2a959cc80c0cc23ff… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Dec 2 21:06:01 2007 +0100 gdi32: Implement GetTextExtentExPointI. --- dlls/gdi32/font.c | 46 ++++++++++++++++++++++++++++++++++++---------- dlls/gdi32/freetype.c | 27 +++++++++++++++++++-------- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 57 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1b80df1..1a179d5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1144,34 +1144,40 @@ BOOL WINAPI GetTextExtentPoint32W( } /*********************************************************************** - * GetTextExtentPointI [GDI32.@] + * GetTextExtentExPointI [GDI32.@] * * Computes width and height of the array of glyph indices. * + * PARAMS + * hdc [I] Handle of device context. + * indices [I] Glyph index array. + * count [I] Number of glyphs in array. + * max_ext [I] Maximum width in glyphs. + * nfit [O] Maximum number of characters. + * dxs [O] Partial string widths. + * size [O] Returned string size. + * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI GetTextExtentPointI( - HDC hdc, /* [in] Handle of device context */ - const WORD *indices, /* [in] Address of glyph index array */ - INT count, /* [in] Number of glyphs in array */ - LPSIZE size) /* [out] Address of structure for string size */ +BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT max_ext, + LPINT nfit, LPINT dxs, LPSIZE size ) { BOOL ret = FALSE; DC * dc = DC_GetDCPtr( hdc ); if (!dc) return FALSE; if(dc->gdiFont) { - ret = WineEngGetTextExtentPointI(dc->gdiFont, indices, count, size); - size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); - size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); + ret = WineEngGetTextExtentExPointI(dc->gdiFont, indices, count, max_ext, nfit, dxs, size); + size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); + size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); size->cx += count * dc->charExtra; } else if(dc->funcs->pGetTextExtentExPoint) { FIXME("calling GetTextExtentExPoint\n"); ret = dc->funcs->pGetTextExtentExPoint( dc->physDev, (LPCWSTR)indices, - count, 0, NULL, NULL, size ); + count, max_ext, nfit, dxs, size ); } DC_ReleaseDCPtr( dc ); @@ -1181,6 +1187,26 @@ BOOL WINAPI GetTextExtentPointI( return ret; } +/*********************************************************************** + * GetTextExtentPointI [GDI32.@] + * + * Computes width and height of the array of glyph indices. + * + * PARAMS + * hdc [I] Handle of device context. + * indices [I] Glyph index array. + * count [I] Number of glyphs in array. + * size [O] Returned string size. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI GetTextExtentPointI( HDC hdc, const WORD *indices, INT count, LPSIZE size ) +{ + return GetTextExtentExPointI( hdc, indices, count, 0, NULL, NULL, size ); +} + /*********************************************************************** * GetTextExtentPointA (GDI32.@) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a79f41d..e9fb663 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4580,17 +4580,18 @@ BOOL WineEngGetTextExtentExPoint(GdiFont *font, LPCWSTR wstr, INT count, } /************************************************************* - * WineEngGetTextExtentPointI + * WineEngGetTextExtentExPointI * */ -BOOL WineEngGetTextExtentPointI(GdiFont *font, const WORD *indices, INT count, - LPSIZE size) +BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, + INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size) { INT idx; + INT nfit = 0, ext; GLYPHMETRICS gm; TEXTMETRICW tm; - TRACE("%p, %p, %d, %p\n", font, indices, count, size); + TRACE("%p, %p, %d, %d, %p\n", font, indices, count, max_ext, size); size->cx = 0; WineEngGetTextMetrics(font, &tm); @@ -4600,9 +4601,19 @@ BOOL WineEngGetTextExtentPointI(GdiFont *font, const WORD *indices, INT count, WineEngGetGlyphOutline(font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, NULL); - size->cx += FONT_GM(font,indices[idx])->adv; + size->cx += FONT_GM(font,indices[idx])->adv; + ext = size->cx; + if (! pnfit || ext <= max_ext) { + ++nfit; + if (dxs) + dxs[idx] = ext; + } } - TRACE("return %d,%d\n", size->cx, size->cy); + + if (pnfit) + *pnfit = nfit; + + TRACE("return %d, %d, %d\n", size->cx, size->cy, nfit); return TRUE; } @@ -5129,8 +5140,8 @@ BOOL WineEngGetTextExtentExPoint(GdiFont *font, LPCWSTR wstr, INT count, return FALSE; } -BOOL WineEngGetTextExtentPointI(GdiFont *font, const WORD *indices, INT count, - LPSIZE size) +BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, + INT max_ext, LPINT nfit, LPINT dx, LPSIZE size) { ERR("called but we don't have FreeType\n"); return FALSE; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 025dd25..c04bba7 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -332,7 +332,7 @@ @ stdcall GetTextCharsetInfo(long ptr long) @ stdcall GetTextColor(long) @ stdcall GetTextExtentExPointA(long str long long ptr ptr ptr) -# @ stub GetTextExtentExPointI +@ stdcall GetTextExtentExPointI(long ptr long long ptr ptr ptr) @ stdcall GetTextExtentExPointW(long wstr long long ptr ptr ptr) # @ stub GetTextExtentExPointWPri @ stdcall GetTextExtentPoint32A(long str long ptr) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3e49642..21cf577 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -444,7 +444,7 @@ extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph extern UINT WineEngGetOutlineTextMetrics(GdiFont*, UINT, LPOUTLINETEXTMETRICW) DECLSPEC_HIDDEN; extern UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) DECLSPEC_HIDDEN; extern BOOL WineEngGetTextExtentExPoint(GdiFont*, LPCWSTR, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; -extern BOOL WineEngGetTextExtentPointI(GdiFont*, const WORD *, INT, LPSIZE) DECLSPEC_HIDDEN; +extern BOOL WineEngGetTextExtentExPointI(GdiFont*, const WORD *, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngGetTextMetrics(GdiFont*, LPTEXTMETRICW) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : kernel32: Implement and test {G, S}etConsoleInputExeName{A , W}.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 8f3afb41204ba9886b88da58d0b4478346940948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3afb41204ba9886b88da58d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Dec 2 22:12:19 2007 +0100 kernel32: Implement and test {G, S}etConsoleInputExeName{A, W}. --- dlls/kernel32/console.c | 88 +++++++++++++++++++++++++--------------- dlls/kernel32/tests/console.c | 53 ++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 33 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index ec9c15c..1f24614 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -55,6 +55,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(console); +static CRITICAL_SECTION CONSOLE_CritSect; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &CONSOLE_CritSect, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": CONSOLE_CritSect") } +}; +static CRITICAL_SECTION CONSOLE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; + static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; @@ -982,23 +991,35 @@ BOOL WINAPI GetConsoleKeyboardLayoutNameW(LPWSTR layoutName) return TRUE; } +static WCHAR input_exe[MAX_PATH + 1]; + /*********************************************************************** - * GetConsoleInputExeNameA (KERNEL32.@) + * GetConsoleInputExeNameW (KERNEL32.@) */ -DWORD WINAPI GetConsoleInputExeNameA(DWORD BufferLength, LPSTR lpBuffer) +BOOL WINAPI GetConsoleInputExeNameW(DWORD buflen, LPWSTR buffer) { - DWORD ret = 0; - FIXME( "stub %u %p\n", BufferLength, lpBuffer); - return ret; + TRACE("%u %p\n", buflen, buffer); + + RtlEnterCriticalSection(&CONSOLE_CritSect); + if (buflen > strlenW(input_exe)) strcpyW(buffer, input_exe); + else SetLastError(ERROR_BUFFER_OVERFLOW); + RtlLeaveCriticalSection(&CONSOLE_CritSect); + + return TRUE; } /*********************************************************************** - * GetConsoleInputExeNameW (KERNEL32.@) + * GetConsoleInputExeNameA (KERNEL32.@) */ -DWORD WINAPI GetConsoleInputExeNameW(DWORD BufferLength, LPWSTR lpBuffer) +BOOL WINAPI GetConsoleInputExeNameA(DWORD buflen, LPSTR buffer) { - DWORD ret = 0; - FIXME( "stub %u %p\n", BufferLength, lpBuffer); + WCHAR *bufferW; + BOOL ret; + + if (!(bufferW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * buflen))) return FALSE; + if ((ret = GetConsoleInputExeNameW(buflen, bufferW))) + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, buffer, buflen, NULL, NULL); + HeapFree(GetProcessHeap(), 0, bufferW); return ret; } @@ -1467,35 +1488,45 @@ BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons) /****************************************************************************** * SetConsoleInputExeNameW [KERNEL32.@] - * - * BUGS - * Unimplemented */ BOOL WINAPI SetConsoleInputExeNameW(LPCWSTR name) { - FIXME("(%s): stub!\n", debugstr_w(name)); + TRACE("(%s)\n", debugstr_w(name)); + + if (!name || !name[0]) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + RtlEnterCriticalSection(&CONSOLE_CritSect); + if (strlenW(name) < sizeof(input_exe)/sizeof(WCHAR)) strcpyW(input_exe, name); + RtlLeaveCriticalSection(&CONSOLE_CritSect); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return TRUE; } /****************************************************************************** * SetConsoleInputExeNameA [KERNEL32.@] - * - * BUGS - * Unimplemented */ BOOL WINAPI SetConsoleInputExeNameA(LPCSTR name) { - int len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); - LPWSTR xptr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - BOOL ret; + int len; + LPWSTR nameW; + BOOL ret; - if (!xptr) return FALSE; + if (!name || !name[0]) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); + if (!(nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) return FALSE; - MultiByteToWideChar(CP_ACP, 0, name, -1, xptr, len); - ret = SetConsoleInputExeNameW(xptr); - HeapFree(GetProcessHeap(), 0, xptr); + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, len); + ret = SetConsoleInputExeNameW(nameW); + HeapFree(GetProcessHeap(), 0, nameW); return ret; } @@ -1534,15 +1565,6 @@ struct ConsoleHandler static struct ConsoleHandler CONSOLE_DefaultConsoleHandler = {CONSOLE_DefaultHandler, NULL}; static struct ConsoleHandler* CONSOLE_Handlers = &CONSOLE_DefaultConsoleHandler; -static CRITICAL_SECTION CONSOLE_CritSect; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &CONSOLE_CritSect, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": CONSOLE_CritSect") } -}; -static CRITICAL_SECTION CONSOLE_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; - /*****************************************************************************/ /****************************************************************** diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2a8c467..109b6bb 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -23,6 +23,11 @@ #include <windows.h> #include <stdio.h> +BOOL WINAPI GetConsoleInputExeNameA(DWORD, LPSTR); +BOOL WINAPI GetConsoleInputExeNameW(DWORD, LPWSTR); +BOOL WINAPI SetConsoleInputExeNameA(LPCSTR); +BOOL WINAPI SetConsoleInputExeNameW(LPCWSTR); + /* DEFAULT_ATTRIB is used for all initial filling of the console. * all modifications are made with TEST_ATTRIB so that we could check * what has to be modified or not @@ -746,6 +751,52 @@ static void testScreenBuffer(HANDLE hConOut) SetConsoleOutputCP(oldcp); } +static void test_GetSetConsoleInputExeName(void) +{ + BOOL ret; + DWORD error; + char buffer[MAX_PATH], module[MAX_PATH], *p; + static char input_exe[MAX_PATH] = "winetest.exe"; + + SetLastError(0xdeadbeef); + ret = GetConsoleInputExeNameA(0, NULL); + error = GetLastError(); + ok(ret, "GetConsoleInputExeNameA failed\n"); + ok(error == ERROR_BUFFER_OVERFLOW, "got %u expected ERROR_BUFFER_OVERFLOW\n", error); + + SetLastError(0xdeadbeef); + ret = GetConsoleInputExeNameA(0, buffer); + error = GetLastError(); + ok(ret, "GetConsoleInputExeNameA failed\n"); + ok(error == ERROR_BUFFER_OVERFLOW, "got %u expected ERROR_BUFFER_OVERFLOW\n", error); + + GetModuleFileNameA(GetModuleHandle(NULL), module, sizeof(module)); + p = strrchr(module, '\\') + 1; + + ret = GetConsoleInputExeNameA(sizeof(buffer)/sizeof(buffer[0]), buffer); + ok(ret, "GetConsoleInputExeNameA failed\n"); + todo_wine ok(!lstrcmpA(buffer, p), "got %s expected %s\n", buffer, p); + + SetLastError(0xdeadbeef); + ret = SetConsoleInputExeNameA(NULL); + error = GetLastError(); + ok(!ret, "SetConsoleInputExeNameA failed\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); + + SetLastError(0xdeadbeef); + ret = SetConsoleInputExeNameA(""); + error = GetLastError(); + ok(!ret, "SetConsoleInputExeNameA failed\n"); + ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); + + ret = SetConsoleInputExeNameA(input_exe); + ok(ret, "SetConsoleInputExeNameA failed\n"); + + ret = GetConsoleInputExeNameA(sizeof(buffer)/sizeof(buffer[0]), buffer); + ok(ret, "GetConsoleInputExeNameA failed\n"); + ok(!lstrcmpA(buffer, input_exe), "got %s expected %s\n", buffer, input_exe); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -784,4 +835,6 @@ START_TEST(console) testScreenBuffer(hConOut); testCtrlHandler(); /* still to be done: access rights & access on objects */ + + test_GetSetConsoleInputExeName(); }

1 0

Alexander Nicolaysen Sørnes : shell32: Localize file context menu.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: cf8c1d60a100a29c19c1156dc660cd5bcab377c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8c1d60a100a29c19c1156dc… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Dec 1 20:47:23 2007 +0100 shell32: Localize file context menu. --- dlls/shell32/shell32_Bg.rc | 1 + dlls/shell32/shell32_Ca.rc | 22 +++++++++++++ dlls/shell32/shell32_Cn.rc | 22 +++++++++++++ dlls/shell32/shell32_Cs.rc | 1 + dlls/shell32/shell32_Da.rc | 22 +++++++++++++ dlls/shell32/shell32_De.rc | 1 + dlls/shell32/shell32_En.rc | 1 + dlls/shell32/shell32_Eo.rc | 1 + dlls/shell32/shell32_Es.rc | 1 + dlls/shell32/shell32_Fi.rc | 1 + dlls/shell32/shell32_Fr.rc | 1 + dlls/shell32/shell32_Hu.rc | 22 +++++++++++++ dlls/shell32/shell32_It.rc | 1 + dlls/shell32/shell32_Ja.rc | 1 + dlls/shell32/shell32_Ko.rc | 1 + dlls/shell32/shell32_Nl.rc | 22 +++++++++++++ dlls/shell32/shell32_No.rc | 3 +- dlls/shell32/shell32_Pl.rc | 1 + dlls/shell32/shell32_Pt.rc | 1 + dlls/shell32/shell32_Ru.rc | 1 + dlls/shell32/shell32_Si.rc | 22 +++++++++++++ dlls/shell32/shell32_Sk.rc | 22 +++++++++++++ dlls/shell32/shell32_Sv.rc | 22 +++++++++++++ dlls/shell32/shell32_Tr.rc | 1 + dlls/shell32/shell32_Uk.rc | 1 + dlls/shell32/shell32_Wa.rc | 22 +++++++++++++ dlls/shell32/shell32_Zh.rc | 22 +++++++++++++ dlls/shell32/shresdef.h | 2 + dlls/shell32/shv_item_cmenu.c | 70 +++++++++++++++++++++++++++++------------ 29 files changed, 290 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf8c1d60a100a29c19c11…

1 0

Zac Brown : wininet: Add test for FtpGetCurrentDirectoryA in wininet/tests/ ftp.c.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: 6ad1ef7a283906dcb0903baac014202e9000ee95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad1ef7a283906dcb0903baac… Author: Zac Brown <zac(a)zacbrown.org> Date: Sat Dec 1 17:25:58 2007 -0500 wininet: Add test for FtpGetCurrentDirectoryA in wininet/tests/ftp.c. --- dlls/wininet/tests/ftp.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 6d03fb8..1f63752 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -691,6 +691,89 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) } } +static void test_get_current_dir(HINTERNET hFtp, HINTERNET hConnect) +{ + BOOL bRet; + DWORD dwCurrentDirectoryLen = MAX_PATH; + CHAR lpszCurrentDirectory[MAX_PATH]; + + /* change directories to get a more interesting pwd */ + bRet = FtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, "CWD pub/", 0, NULL); + if(bRet == FALSE) + { + skip("Failed to change directories in test_get_current_dir(HINTERNET hFtp).\n"); + return; + } + + /* test with all NULL arguments */ + SetLastError(0xdeadbeef); + bRet = FtpGetCurrentDirectoryA( NULL, NULL, 0 ); + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); + ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got: %d\n", GetLastError()); + + /* test with NULL parameters instead of expected LPSTR/LPDWORD */ + SetLastError(0xdeadbeef); + bRet = FtpGetCurrentDirectoryA( hFtp, NULL, 0 ); + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); + ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got: %d\n", GetLastError()); + + /* test with no valid handle and valid parameters */ + SetLastError(0xdeadbeef); + bRet = FtpGetCurrentDirectoryA( NULL, lpszCurrentDirectory, &dwCurrentDirectoryLen ); + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); + ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got: %d\n", GetLastError()); + + /* test with invalid dwCurrentDirectory and all other parameters correct */ + SetLastError(0xdeadbeef); + bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, 0 ); + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); + ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got: %d\n", GetLastError()); + + /* test with invalid lpszCurrentDirectory and all other parameters correct */ + SetLastError(0xdeadbeef); + bRet = FtpGetCurrentDirectoryA( hFtp, NULL, &dwCurrentDirectoryLen ); + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); + ok ( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got: %d\n", GetLastError()); + + /* test to show it checks the handle type */ + SetLastError(0xdeadbeef); + bRet = FtpGetCurrentDirectoryA( hConnect, lpszCurrentDirectory, &dwCurrentDirectoryLen ); + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n" ); + ok ( GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, + "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got: %d\n", GetLastError()); + + /* test for the current directory with legitimate values */ + SetLastError(0xdeadbeef); + bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectoryLen ); + ok ( bRet == TRUE, "Expected FtpGetCurrentDirectoryA to pass\n" ); +todo_wine + ok ( lstrcmp(lpszCurrentDirectory, "/pub") == 0, "Expected returned value \"%s\" to match \"%s\" \n", (char*)lpszCurrentDirectory, "/pub"); + ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got: %d\n", GetLastError()); + + + /* test for the current directory with a size only large enough to + * fit the string and not the null terminating character */ + SetLastError(0xdeadbeef); + dwCurrentDirectoryLen = 4; + lpszCurrentDirectory[4] = 'a'; /* set position 4 of the array to something else to make sure a leftover \0 isn't fooling the test */ + bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectoryLen ); +todo_wine + ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n"); + ok ( lstrcmp(lpszCurrentDirectory, "/pub") != 0, "Expected returned value \"%s\" to not match \"%s\" \n", (char*)lpszCurrentDirectory, "/pub"); +todo_wine + ok ( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got: %d\n", GetLastError()); + + /* test for the current directory with a size large enough to store + * the expected string as well as the null terminating character */ + SetLastError(0xdeadbeef); + dwCurrentDirectoryLen = 5; + bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectoryLen ); + ok ( bRet == TRUE, "Expected FtpGetCurrentDirectoryA to pass\n"); +todo_wine + ok ( lstrcmp(lpszCurrentDirectory, "/pub") == 0, "Expected returned value \"%s\" to match \"%s\" \n", (char*)lpszCurrentDirectory, "/pub"); + ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got: %d\n", GetLastError()); +} + START_TEST(ftp) { HANDLE hInternet, hFtp, hHttp; @@ -733,6 +816,7 @@ START_TEST(ftp) test_removedir(hFtp, hHttp); test_renamefile(hFtp, hHttp); test_command(hFtp, hHttp); + test_get_current_dir(hFtp, hHttp); InternetCloseHandle(hHttp); InternetCloseHandle(hFtp);

1 0

Zac Brown : wininet: Fix FtpGetCurrentDirectoryW to handle bad input.
by Alexandre Julliard Dec. 3, 2007

Dec. 3, 2007

Module: wine Branch: master Commit: b9b900f4b89f4225259b02482fb8d828fa693586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b900f4b89f4225259b02482… Author: Zac Brown <zac(a)zacbrown.org> Date: Sat Dec 1 17:21:07 2007 -0500 wininet: Fix FtpGetCurrentDirectoryW to handle bad input. --- dlls/wininet/ftp.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 39fbc90..ce60fa0 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -885,12 +885,30 @@ BOOL WINAPI FtpGetCurrentDirectoryW(HINTERNET hFtpSession, LPWSTR lpszCurrentDir TRACE("len(%d)\n", *lpdwCurrentDirectory); lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); - if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) + if (NULL == lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + goto lend; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); goto lend; } + if (!lpdwCurrentDirectory) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + + if (lpszCurrentDirectory == NULL) + { + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto lend; + } + if (lpwfs->download_in_progress != NULL) { INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS);

1 0