June 2009 - Wine-commits - list.winehq.org

Rein Klazes : comdlg32/tests: Fix file dialog resize failures on NT4 and with tiny desktops.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 8526eee4721d08599b94cee1e8d0e5d9ebe54680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8526eee4721d08599b94cee1e… Author: Rein Klazes <wijn(a)online.nl> Date: Wed Jun 17 08:18:04 2009 +0200 comdlg32/tests: Fix file dialog resize failures on NT4 and with tiny desktops. --- dlls/comdlg32/tests/filedlg.c | 10 +++++++--- dlls/comdlg32/tests/rsrc.rc | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 8b8d6e7..6280c89 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -309,8 +309,12 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L /* test style */ style = GetWindowLong( parent, GWL_STYLE); if( resize_testcases[index].flags & OFN_ENABLESIZING) - ok( style & WS_SIZEBOX, - "testid %d: dialog should have a WS_SIZEBOX style.\n", index); + if( !(style & WS_SIZEBOX)) { + win_skip( "OFN_ENABLESIZING flag not supported.\n"); + PostMessage( parent, WM_COMMAND, IDCANCEL, 0); + } else + ok( style & WS_SIZEBOX, + "testid %d: dialog should have a WS_SIZEBOX style.\n", index); else ok( !(style & WS_SIZEBOX), "testid %d: dialog should not have a WS_SIZEBOX style.\n", index); @@ -383,7 +387,7 @@ static void test_resize(void) ofn.nMaxFile = 1042; ofn.lpfnHook = (LPOFNHOOKPROC) resize_template_hook; ofn.hInstance = GetModuleHandle(NULL); - ofn.lpTemplateName = "template1"; + ofn.lpTemplateName = "template_sz"; for( i = 0; resize_testcases[i].flags != 0xffffffff; i++) { ofn.lCustData = i; ofn.Flags = resize_testcases[i].flags | diff --git a/dlls/comdlg32/tests/rsrc.rc b/dlls/comdlg32/tests/rsrc.rc index 51415fd..9600d85 100644 --- a/dlls/comdlg32/tests/rsrc.rc +++ b/dlls/comdlg32/tests/rsrc.rc @@ -32,3 +32,19 @@ FONT 8, "MS Shell Dlg" LTEXT "",-1,28,16,204,31 EDITTEXT 56,65,2,200,12,ES_AUTOHSCROLL } + +/* Used by the resize file dialog tests. + * Keep this template small or get failures + * resizing on small desk tops. + * This will work with 640x480 pixels + */ +TEMPLATE_SZ DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 300, 40 +STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS +FONT 8, "MS Shell Dlg" +{ + LTEXT "Path:",-1,28,4,36,8 + LTEXT "Text1",-1,4,16,20,40 + LTEXT "Text2",-1,232,20,65,8 + LTEXT "",-1,28,16,204,31 + EDITTEXT 56,65,2,200,12,ES_AUTOHSCROLL +}

1 0

Aric Stewart : msctf: Implement ITfThreadMgr::IsThreadFocus.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 2e52edf38d19034796c1040f3b5a07f972cb051b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e52edf38d19034796c1040f3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 17 16:59:35 2009 +0900 msctf: Implement ITfThreadMgr::IsThreadFocus. --- dlls/msctf/threadmgr.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 6d31198..b109107 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -365,9 +365,12 @@ ITfDocumentMgr *pdimNew, ITfDocumentMgr **ppdimPrev) static HRESULT WINAPI ThreadMgr_IsThreadFocus( ITfThreadMgr* iface, BOOL *pfThreadFocus) { + HWND focus; ThreadMgr *This = (ThreadMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,pfThreadFocus); + focus = GetFocus(); + *pfThreadFocus = (focus == NULL); + return S_OK; } static HRESULT WINAPI ThreadMgr_GetFunctionProvider( ITfThreadMgr* iface, REFCLSID clsid,

1 0

Aric Stewart : msctf: Contexts have a default DocumentMgr of the one that creates them.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: ca9ca58c20a5ab0297b4f0db18ac02c5639be8b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca9ca58c20a5ab0297b4f0db1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 17 17:00:03 2009 +0900 msctf: Contexts have a default DocumentMgr of the one that creates them. --- dlls/msctf/context.c | 3 ++- dlls/msctf/documentmgr.c | 2 +- dlls/msctf/msctf_internal.h | 2 +- dlls/msctf/tests/inputprocessor.c | 10 ++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 5eaffcf..e5cf602 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -709,7 +709,7 @@ static const ITfInsertAtSelectionVtbl Context_InsertAtSelectionVtbl = InsertAtSelection_InsertEmbeddedAtSelection, }; -HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **ppOut, TfEditCookie *pecTextStore) +HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore) { Context *This; EditCookie *cookie; @@ -733,6 +733,7 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **pp This->refCount = 1; This->tidOwner = tidOwner; This->connected = FALSE; + This->manager = mgr; CompartmentMgr_Constructor((IUnknown*)This, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 09cadb6..c7aa820 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -123,7 +123,7 @@ static HRESULT WINAPI DocumentMgr_CreateContext(ITfDocumentMgr *iface, { DocumentMgr *This = (DocumentMgr *)iface; TRACE("(%p) 0x%x 0x%x %p %p %p\n",This,tidOwner,dwFlags,punk,ppic,pecTextStore); - return Context_Constructor(tidOwner, punk, ppic, pecTextStore); + return Context_Constructor(tidOwner, punk, iface, ppic, pecTextStore); } static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 3b959be..d2b1a2e 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -33,7 +33,7 @@ extern ITfCompartmentMgr *globalCompartmentMgr; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink*, ITfDocumentMgr **ppOut); -extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfContext **ppOut, TfEditCookie *pecTextStore); +extern HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr *mgr, ITfContext **ppOut, TfEditCookie *pecTextStore); extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut); diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 90d6989..67d53c6 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1146,6 +1146,11 @@ static void test_startSession(void) hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, NULL, &cxt3, &editCookie); ok(SUCCEEDED(hr),"CreateContext Failed\n"); + hr = ITfContext_GetDocumentMgr(cxt,&dmtest); + ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); + ok(dmtest == g_dm, "Wrong documentmgr\n"); + ITfDocumentMgr_Release(dmtest); + cnt = check_context_refcount(cxt); test_OnPushContext = SINK_EXPECTED; test_ACP_AdviseSink = SINK_EXPECTED; @@ -1215,6 +1220,11 @@ static void test_startSession(void) ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n"); ok(test_OnPopContext == SINK_FIRED, "OnPopContext sink not fired\n"); + dmtest = (void *)0xfeedface; + hr = ITfContext_GetDocumentMgr(cxt2,&dmtest); + ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr); + ok(dmtest == NULL,"returned documentmgr should be null\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n");

1 0

Aric Stewart : msctf: Implement ITfCompartmentMgr::ClearCompartment.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: 979c9296566a29305f0e4d1d78eb72b54ef91147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=979c9296566a29305f0e4d1d7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 17 17:01:16 2009 +0900 msctf: Implement ITfCompartmentMgr::ClearCompartment. --- dlls/msctf/compartmentmgr.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index ecbe3b1..2e6c798 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -33,6 +33,7 @@ #include "winerror.h" #include "objbase.h" #include "oleauto.h" +#include "olectl.h" #include "wine/unicode.h" #include "wine/list.h" @@ -140,9 +141,25 @@ static HRESULT WINAPI CompartmentMgr_GetCompartment(ITfCompartmentMgr *iface, static HRESULT WINAPI CompartmentMgr_ClearCompartment(ITfCompartmentMgr *iface, TfClientId tid, REFGUID rguid) { + struct list *cursor; CompartmentMgr *This = (CompartmentMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %i %s\n",This,tid,debugstr_guid(rguid)); + + LIST_FOR_EACH(cursor, &This->values) + { + CompartmentValue* value = LIST_ENTRY(cursor,CompartmentValue,entry); + if (IsEqualGUID(rguid,&value->guid)) + { + if (value->owner && tid != value->owner) + return E_UNEXPECTED; + list_remove(cursor); + ITfCompartment_Release(value->compartment); + HeapFree(GetProcessHeap(),0,value); + return S_OK; + } + } + + return CONNECT_E_NOCONNECTION; } static HRESULT WINAPI CompartmentMgr_EnumCompartments(ITfCompartmentMgr *iface,

1 0

Alexander Nicolaysen Sørnes : regedit: Fix reading from stdin.
by Alexandre Julliard 17 Jun '09

17 Jun '09

Module: wine Branch: master Commit: dcade8526185e67b3e2e2eceff2de7244a2980bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcade8526185e67b3e2e2ecef… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jun 16 15:46:33 2009 +0200 regedit: Fix reading from stdin. --- programs/regedit/regproc.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 55b0d5f..c46edc6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -610,20 +610,29 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) * * Parameters: * in - input stream to read from + * first_chars - beginning of stream, read due to Unicode check */ -static void processRegLinesA(FILE *in) +static void processRegLinesA(FILE *in, char* first_chars) { LPSTR line = NULL; /* line read from input stream */ ULONG lineSize = REG_VAL_BUF_SIZE; line = HeapAlloc(GetProcessHeap(), 0, lineSize); CHECK_ENOUGH_MEMORY(line); + memcpy(line, first_chars, 2); while (!feof(in)) { LPSTR s; /* The pointer into line for where the current fgets should read */ LPSTR check; WCHAR* lineW; s = line; + + if(first_chars) + { + s += 2; + first_chars = NULL; + } + for (;;) { size_t size_remaining; int size_to_get; @@ -1373,8 +1382,7 @@ BOOL import_registry_file(FILE* reg_file) processRegLinesW(reg_file); } else { - rewind(reg_file); - processRegLinesA(reg_file); + processRegLinesA(reg_file, (char*)s); } } return TRUE;

1 0

Alexandre Julliard : ntdll: Handle x86_64 signals on a separate signal stack.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: a19db6dc11db7fec4f0136f1bff3c1b9355b0de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19db6dc11db7fec4f0136f1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 16 15:27:48 2009 +0200 ntdll: Handle x86_64 signals on a separate signal stack. --- dlls/ntdll/signal_x86_64.c | 302 +++++++++++++++++++++++++++++--------------- 1 files changed, 202 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a19db6dc11db7fec4f013…

1 0

Paul Vriens : shell32/tests: Fix some test failures on NT4 ( and some Win95 boxes).
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 4e4d477c4de9a5e5e1d5952fd61e4aa8d73ae050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4d477c4de9a5e5e1d5952fd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 16 15:07:22 2009 +0200 shell32/tests: Fix some test failures on NT4 (and some Win95 boxes). --- dlls/shell32/tests/appbar.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index dbb75b9..73dc0b2 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -36,6 +36,7 @@ struct testwindow_info { HWND hwnd; BOOL registered; + BOOL to_be_deleted; RECT desired_rect; UINT edge; RECT allocated_rect; @@ -58,6 +59,12 @@ static void testwindow_setpos(HWND hwnd) return; } + if (info->to_be_deleted) + { + win_skip("Some Win95 and NT4 systems send messages to removed taskbars\n"); + return; + } + abd.cbSize = sizeof(abd); abd.hWnd = hwnd; abd.uEdge = info->edge; @@ -221,6 +228,7 @@ static void test_setpos(void) /* dock windows[0] to the bottom of the screen */ windows[0].registered = TRUE; + windows[0].to_be_deleted = FALSE; windows[0].edge = ABE_BOTTOM; windows[0].desired_rect.left = 0; windows[0].desired_rect.right = screen_width; @@ -241,6 +249,7 @@ static void test_setpos(void) /* dock windows[1] to the bottom of the screen */ windows[1].registered = TRUE; + windows[1].to_be_deleted = FALSE; windows[1].edge = ABE_BOTTOM; windows[1].desired_rect.left = 0; windows[1].desired_rect.right = screen_width; @@ -272,6 +281,7 @@ static void test_setpos(void) /* dock windows[2] to the bottom of the screen */ windows[2].registered = TRUE; + windows[2].to_be_deleted = FALSE; windows[2].edge = ABE_BOTTOM; windows[2].desired_rect.left = 0; windows[2].desired_rect.right = screen_width; @@ -328,6 +338,7 @@ static void test_setpos(void) expected_bottom = max(windows[0].allocated_rect.bottom, windows[1].allocated_rect.bottom); abd.hWnd = windows[0].hwnd; + windows[0].to_be_deleted = TRUE; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[0].registered = FALSE; @@ -341,12 +352,14 @@ static void test_setpos(void) /* remove the other windows */ abd.hWnd = windows[1].hwnd; + windows[1].to_be_deleted = TRUE; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[1].registered = FALSE; DestroyWindow(windows[1].hwnd); abd.hWnd = windows[2].hwnd; + windows[2].to_be_deleted = TRUE; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[2].registered = FALSE;

1 0

Anders Jonsson : ntoskrnl.exe: Stub for ExInitializeNPagedLookasideList.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: a2f6bac10781303381d45da8417b12dd3f517f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f6bac10781303381d45da84… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Mon Jun 15 18:23:28 2009 +0200 ntoskrnl.exe: Stub for ExInitializeNPagedLookasideList. --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 3 +++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 236b3fa..59268f3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -909,6 +909,21 @@ NTSTATUS WINAPI ExInitializeResourceLite(PERESOURCE Resource) /*********************************************************************** + * ExInitializeNPagedLookasideList (NTOSKRNL.EXE.@) + */ +void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST Lookaside, + PALLOCATE_FUNCTION Allocate, + PFREE_FUNCTION Free, + ULONG Flags, + SIZE_T Size, + ULONG Tag, + USHORT Depth) +{ + FIXME( "stub: %p, %p, %p, %u, %lu, %u, %u\n", Lookaside, Allocate, Free, Flags, Size, Tag, Depth ); +} + + +/*********************************************************************** * ExInitializeZone (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8b7de2d..0d874bc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -139,7 +139,7 @@ @ stub ExGetExclusiveWaiterCount @ stub ExGetPreviousMode @ stub ExGetSharedWaiterCount -@ stub ExInitializeNPagedLookasideList +@ stdcall ExInitializeNPagedLookasideList(ptr ptr ptr long long long long) @ stub ExInitializePagedLookasideList @ stdcall ExInitializeResourceLite(ptr) @ stdcall ExInitializeZone(ptr long ptr long) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 9ba76de..ccdeca3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -124,13 +124,16 @@ typedef enum _KWAIT_REASON MaximumWaitReason, } KWAIT_REASON; +typedef struct _ALLOCATE_FUNCTION *PALLOCATE_FUNCTION; typedef struct _IO_TIMER *PIO_TIMER; typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE; typedef struct _ETHREAD *PETHREAD; +typedef struct _FREE_FUNCTION *PFREE_FUNCTION; typedef struct _KTHREAD *PKTHREAD; typedef struct _EPROCESS *PEPROCESS; typedef struct _ERESOURCE *PERESOURCE; typedef struct _IO_WORKITEM *PIO_WORKITEM; +typedef struct _NPAGED_LOOKASIDE_LIST *PNPAGED_LOOKASIDE_LIST; typedef struct _OBJECT_TYPE *POBJECT_TYPE; typedef struct _OBJECT_HANDLE_INFORMATION *POBJECT_HANDLE_INFORMATION; typedef struct _ZONE_HEADER *PZONE_HEADER;

1 0

Hans Leidekker : wininet: Don' t fail if dwReserved is set in CreateUrlCacheEntryW.
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: 7ba8c86f852f668ec54f965e3cdda3a23ed93c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba8c86f852f668ec54f965e3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 16 15:13:31 2009 +0200 wininet: Don't fail if dwReserved is set in CreateUrlCacheEntryW. --- dlls/wininet/urlcache.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f385c7e..418f508 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2222,11 +2222,7 @@ BOOL WINAPI CreateUrlCacheEntryW( dwReserved); if (dwReserved) - { - ERR("dwReserved != 0\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + FIXME("dwReserved 0x%08x\n", dwReserved); lpszUrlEnd = lpszUrlName + strlenW(lpszUrlName);

1 0

Hans Leidekker : wininet: Implement InternetQueryOption( INTERNET_OPTION_CACHE_TIMESTAMPS).
by Alexandre Julliard 16 Jun '09

16 Jun '09

Module: wine Branch: master Commit: c29328583d9b2aab39193401371369029f44389b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29328583d9b2aab391934013… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 16 15:13:52 2009 +0200 wininet: Implement InternetQueryOption(INTERNET_OPTION_CACHE_TIMESTAMPS). --- dlls/wininet/http.c | 63 +++++++++++++++++++++++++++++++++++++++----------- include/wininet.h | 6 +++++ 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1922835..e1a7ddc 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1568,6 +1568,20 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); } +static BOOL HTTP_GetRequestURL(WININETHTTPREQW *req, LPWSTR buf) +{ + LPHTTPHEADERW host_header; + + static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; + + host_header = HTTP_GetHeader(req, hostW); + if(!host_header) + return FALSE; + + sprintfW(buf, formatW, host_header->lpszValue, req->lpszPath); /* FIXME */ + return TRUE; +} + static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; @@ -1620,6 +1634,41 @@ static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b } } + case INTERNET_OPTION_CACHE_TIMESTAMPS: { + INTERNET_CACHE_ENTRY_INFOW *info; + INTERNET_CACHE_TIMESTAMPS *ts = buffer; + WCHAR url[INTERNET_MAX_URL_LENGTH]; + DWORD nbytes, error; + BOOL ret; + + TRACE("INTERNET_OPTION_CACHE_TIMESTAMPS\n"); + + if (*size < sizeof(*ts)) + { + *size = sizeof(*ts); + return ERROR_INSUFFICIENT_BUFFER; + } + nbytes = 0; + HTTP_GetRequestURL(req, url); + ret = GetUrlCacheEntryInfoW(url, NULL, &nbytes); + error = GetLastError(); + if (!ret && error == ERROR_INSUFFICIENT_BUFFER) + { + if (!(info = HeapAlloc(GetProcessHeap(), 0, nbytes))) + return ERROR_OUTOFMEMORY; + + GetUrlCacheEntryInfoW(url, info, &nbytes); + + ts->ftExpires = info->ExpireTime; + ts->ftLastModified = info->LastModifiedTime; + + HeapFree(GetProcessHeap(), 0, info); + *size = sizeof(*ts); + return ERROR_SUCCESS; + } + return error; + } + case INTERNET_OPTION_DATAFILE_NAME: { DWORD req_size; @@ -3244,20 +3293,6 @@ BOOL WINAPI HttpSendRequestA(HINTERNET hHttpRequest, LPCSTR lpszHeaders, return result; } -static BOOL HTTP_GetRequestURL(WININETHTTPREQW *req, LPWSTR buf) -{ - LPHTTPHEADERW host_header; - - static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; - - host_header = HTTP_GetHeader(req, hostW); - if(!host_header) - return FALSE; - - sprintfW(buf, formatW, host_header->lpszValue, req->lpszPath); /* FIXME */ - return TRUE; -} - /*********************************************************************** * HTTP_GetRedirectURL (internal) */ diff --git a/include/wininet.h b/include/wininet.h index e37700a..fb6f31f 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1536,6 +1536,12 @@ typedef struct _INTERNET_CACHE_ENTRY_INFOW { DECL_WINELIB_TYPE_AW(INTERNET_CACHE_ENTRY_INFO) DECL_WINELIB_TYPE_AW(LPINTERNET_CACHE_ENTRY_INFO) +typedef struct _INTERNET_CACHE_TIMESTAMPS +{ + FILETIME ftExpires; + FILETIME ftLastModified; +} INTERNET_CACHE_TIMESTAMPS, *LPINTERNET_CACHE_TIMESTAMPS; + BOOLAPI CreateUrlCacheEntryA(LPCSTR ,DWORD ,LPCSTR ,LPSTR ,DWORD); BOOLAPI CreateUrlCacheEntryW(LPCWSTR ,DWORD ,LPCWSTR ,LPWSTR ,DWORD); #define CreateUrlCacheEntry WINELIB_NAME_AW(CreateUrlCacheEntry)

1 0