August 2007 - Wine-commits - list.winehq.org

Detlef Riekenberg : winspool: Implement AddPrinterDriverExA.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 4ff59a8320f920c693cba8a2fa00ed5af2334bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff59a8320f920c693cba8a2f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Aug 16 05:18:08 2007 +0200 winspool: Implement AddPrinterDriverExA. --- dlls/winspool.drv/info.c | 126 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 119 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6f09e7f..56203da 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -6635,15 +6635,127 @@ BOOL WINAPI AddPrinterDriverExW( LPWSTR pName, DWORD level, LPBYTE pDriverInfo, } /****************************************************************************** - * AddPrinterDriverExA (WINSPOOL.@) + * AddPrinterDriverExA (WINSPOOL.@) + * + * See AddPrinterDriverExW. + * */ -BOOL WINAPI AddPrinterDriverExA( LPSTR pName, DWORD Level, - LPBYTE pDriverInfo, DWORD dwFileCopyFlags) +BOOL WINAPI AddPrinterDriverExA(LPSTR pName, DWORD Level, LPBYTE pDriverInfo, DWORD dwFileCopyFlags) { - FIXME("%s %d %p %d\n", debugstr_a(pName), - Level, pDriverInfo, dwFileCopyFlags); - SetLastError(ERROR_PRINTER_DRIVER_BLOCKED); - return FALSE; + DRIVER_INFO_8A *diA; + DRIVER_INFO_8W diW; + LPWSTR nameW = NULL; + DWORD lenA; + DWORD len; + DWORD res = FALSE; + + FIXME("(%s, %d, %p, 0x%x)\n", debugstr_a(pName), Level, pDriverInfo, dwFileCopyFlags); + diA = (DRIVER_INFO_8A *) pDriverInfo; + ZeroMemory(&diW, sizeof(diW)); + + if (Level < 2 || Level == 5 || Level == 7 || Level > 8) { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if (diA == NULL) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* convert servername to unicode */ + if (pName) { + len = MultiByteToWideChar(CP_ACP, 0, pName, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pName, -1, nameW, len); + } + + /* common fields */ + diW.cVersion = diA->cVersion; + + len = MultiByteToWideChar(CP_ACP, 0, diA->pName, -1, NULL, 0); + diW.pName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pName, -1, diW.pName, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pEnvironment, -1, NULL, 0); + diW.pEnvironment = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pEnvironment, -1, diW.pEnvironment, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pDriverPath, -1, NULL, 0); + diW.pDriverPath = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pDriverPath, -1, diW.pDriverPath, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pDataFile, -1, NULL, 0); + diW.pDataFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pDataFile, -1, diW.pDataFile, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pConfigFile, -1, NULL, 0); + diW.pConfigFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pConfigFile, -1, diW.pConfigFile, len); + + if (Level > 2) { + lenA = multi_sz_lenA(diA->pDependentFiles); + len = MultiByteToWideChar(CP_ACP, 0, diA->pDependentFiles, lenA, NULL, 0); + diW.pDependentFiles = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pDependentFiles, lenA, diW.pDependentFiles, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pMonitorName, -1, NULL, 0); + diW.pMonitorName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pMonitorName, -1, diW.pMonitorName, len); + } + + if (Level > 3) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pDefaultDataType, -1, NULL, 0); + diW.pDefaultDataType = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pDefaultDataType, -1, diW.pDefaultDataType, len); + + lenA = multi_sz_lenA(diA->pszzPreviousNames); + len = MultiByteToWideChar(CP_ACP, 0, diA->pszzPreviousNames, lenA, NULL, 0); + diW.pszzPreviousNames = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszzPreviousNames, lenA, diW.pszzPreviousNames, len); + } + + if (Level > 5) { + len = MultiByteToWideChar(CP_ACP, 0, diA->pszMfgName, -1, NULL, 0); + diW.pszMfgName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszMfgName, -1, diW.pszMfgName, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pszOEMUrl, -1, NULL, 0); + diW.pszOEMUrl = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszOEMUrl, -1, diW.pszOEMUrl, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pszHardwareID, -1, NULL, 0); + diW.pszHardwareID = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszHardwareID, -1, diW.pszHardwareID, len); + + len = MultiByteToWideChar(CP_ACP, 0, diA->pszProvider, -1, NULL, 0); + diW.pszProvider = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, diA->pszProvider, -1, diW.pszProvider, len); + } + + if (Level > 7) { + FIXME("level %u is incomplete\n", Level); + } + + res = AddPrinterDriverExW(nameW, Level, (LPBYTE) &diW, dwFileCopyFlags); + TRACE("got %u with %u\n", res, GetLastError()); + HeapFree(GetProcessHeap(), 0, nameW); + HeapFree(GetProcessHeap(), 0, diW.pName); + HeapFree(GetProcessHeap(), 0, diW.pEnvironment); + HeapFree(GetProcessHeap(), 0, diW.pDriverPath); + HeapFree(GetProcessHeap(), 0, diW.pDataFile); + HeapFree(GetProcessHeap(), 0, diW.pConfigFile); + HeapFree(GetProcessHeap(), 0, diW.pDependentFiles); + HeapFree(GetProcessHeap(), 0, diW.pMonitorName); + HeapFree(GetProcessHeap(), 0, diW.pDefaultDataType); + HeapFree(GetProcessHeap(), 0, diW.pszzPreviousNames); + HeapFree(GetProcessHeap(), 0, diW.pszMfgName); + HeapFree(GetProcessHeap(), 0, diW.pszOEMUrl); + HeapFree(GetProcessHeap(), 0, diW.pszHardwareID); + HeapFree(GetProcessHeap(), 0, diW.pszProvider); + + TRACE("=> %u with %u\n", res, GetLastError()); + return res; } /******************************************************************************

1 0

Alexander Nicolaysen Sørnes : comdlg32: printdlg: Set/Load paper orientation in PageSetupDlgW.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: cd00a42e5653f2c5aa956c05efe91641f285af2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd00a42e5653f2c5aa956c05e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Aug 4 23:14:20 2007 +0200 comdlg32: printdlg: Set/Load paper orientation in PageSetupDlgW. --- dlls/comdlg32/printdlg.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 8491aa7..4bc1921 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2563,6 +2563,13 @@ PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pda) { pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y; pda->dlga->ptPaperSize.y = tmp; } + + /* Save orientation */ + if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) + dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; + else + dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; + GlobalUnlock(pda->pdlg.hDevNames); GlobalUnlock(pda->pdlg.hDevMode); return TRUE; @@ -3238,6 +3245,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; PageSetupDataW *pda; + LPDEVMODEW dm; BOOL res = FALSE; if (uMsg==WM_INITDIALOG) { @@ -3263,11 +3271,14 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) EnableWindow(GetDlgItem(hDlg, edt6), FALSE); EnableWindow(GetDlgItem(hDlg, edt7), FALSE); } - /* width larger as height -> landscape */ - if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y) + + dm = GlobalLock(pda->dlga->hDevMode); + /* Landscape orientation */ + if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE) CheckRadioButton(hDlg, rad1, rad2, rad2); else /* this is default if papersize is not set */ CheckRadioButton(hDlg, rad1, rad2, rad1); + GlobalUnlock(pda->dlga->hDevMode); if (pda->dlga->Flags & PSD_DISABLEORIENTATION) { EnableWindow(GetDlgItem(hDlg,rad1),FALSE); EnableWindow(GetDlgItem(hDlg,rad2),FALSE);

1 0

Marcus Meissner : kernel32: Initialize variable to a known bad value.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: f2ccdecd4b203a45d0fe0099c2930dc2ba601c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ccdecd4b203a45d0fe0099c… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Aug 15 17:08:50 2007 +0200 kernel32: Initialize variable to a known bad value. --- dlls/kernel32/tests/pipe.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index fa158ee..18cc233 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -970,10 +970,11 @@ static void test_ImpersonateNamedPipeClient(HANDLE hClientToken, DWORD security_ (*test_func)(0, hToken); + ImpersonationLevel = 0xdeadbeef; /* to avoid false positives */ ret = GetTokenInformation(hToken, TokenImpersonationLevel, &ImpersonationLevel, sizeof(ImpersonationLevel), &size); todo_wine { ok(ret, "GetTokenInformation(TokenImpersonationLevel) failed with error %d\n", GetLastError()); - ok(ImpersonationLevel == SecurityImpersonation, "ImpersonationLevel should have been SecurityImpersonation instead of %d\n", ImpersonationLevel); + ok(ImpersonationLevel == SecurityImpersonation, "ImpersonationLevel should have been SecurityImpersonation(%d) instead of %d\n", SecurityImpersonation, ImpersonationLevel); } CloseHandle(hToken);

1 0

Jacek Caban : mshtml: Store HTMLDocument reference in HTMLSelectionObject.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 931714e7b791e62525b08853a186eaa61d44143c URL: http://source.winehq.org/git/wine.git/?a=commit;h=931714e7b791e62525b08853a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 15 19:17:49 2007 +0200 mshtml: Store HTMLDocument reference in HTMLSelectionObject. --- dlls/mshtml/htmldoc.c | 5 ++++- dlls/mshtml/mshtml_private.h | 6 +++++- dlls/mshtml/selection.c | 19 ++++++++++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f75d591..f70b96e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -172,6 +172,7 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) if(This->window) IHTMLWindow2_Release(HTMLWINDOW2(This->window)); + detach_selection(This); release_nodes(This); ConnectionPointContainer_Destroy(&This->cp_container); @@ -376,7 +377,7 @@ static HRESULT WINAPI HTMLDocument_get_selection(IHTMLDocument2 *iface, IHTMLSel } } - *p = HTMLSelectionObject_Create(nsselection); + *p = HTMLSelectionObject_Create(This, nsselection); return S_OK; } @@ -1128,6 +1129,8 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) ret->readystate = READYSTATE_UNINITIALIZED; ret->window = NULL; + list_init(&ret->selection_list); + hres = IHTMLDocument_QueryInterface(HTMLDOC(ret), riid, ppvObject); if(FAILED(hres)) { mshtml_free(ret); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d96c0fc..69472ff 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -150,6 +150,8 @@ struct HTMLDocument { ConnectionPoint cp_htmldocevents2; ConnectionPoint cp_propnotif; + struct list selection_list; + HTMLDOMNode *nodes; }; @@ -401,11 +403,13 @@ HRESULT load_stream(BSCallback*,IStream*); void set_document_bscallback(HTMLDocument*,BSCallback*); void set_current_mon(HTMLDocument*,IMoniker*); -IHTMLSelectionObject *HTMLSelectionObject_Create(nsISelection*); +IHTMLSelectionObject *HTMLSelectionObject_Create(HTMLDocument*,nsISelection*); IHTMLTxtRange *HTMLTxtRange_Create(nsIDOMRange*); IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration*); IHTMLStyleSheet *HTMLStyleSheet_Create(void); +void detach_selection(HTMLDocument*); + void HTMLElement_Create(HTMLDOMNode*); void HTMLBodyElement_Create(HTMLElement*); void HTMLInputElement_Create(HTMLElement*); diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index fe191f4..1ee3b97 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -42,6 +42,9 @@ typedef struct { LONG ref; nsISelection *nsselection; + HTMLDocument *doc; + + struct list entry; } HTMLSelectionObject; #define HTMLSELOBJ(x) ((IHTMLSelectionObject*) &(x)->lpHTMLSelectionObjectVtbl) @@ -95,6 +98,8 @@ static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface) if(!ref) { if(This->nsselection) nsISelection_Release(This->nsselection); + if(This->doc) + list_remove(&This->entry); mshtml_free(This); } @@ -208,7 +213,7 @@ static const IHTMLSelectionObjectVtbl HTMLSelectionObjectVtbl = { HTMLSelectionObject_get_type }; -IHTMLSelectionObject *HTMLSelectionObject_Create(nsISelection *nsselection) +IHTMLSelectionObject *HTMLSelectionObject_Create(HTMLDocument *doc, nsISelection *nsselection) { HTMLSelectionObject *ret = mshtml_alloc(sizeof(HTMLSelectionObject)); @@ -216,5 +221,17 @@ IHTMLSelectionObject *HTMLSelectionObject_Create(nsISelection *nsselection) ret->ref = 1; ret->nsselection = nsselection; /* We shouldn't call AddRef here */ + ret->doc = doc; + list_add_head(&doc->selection_list, &ret->entry); + return HTMLSELOBJ(ret); } + +void detach_selection(HTMLDocument *This) +{ + HTMLSelectionObject *iter; + + LIST_FOR_EACH_ENTRY(iter, &This->selection_list, HTMLSelectionObject, entry) { + iter->doc = NULL; + } +}

1 0

Evan Stade : gdiplus: Fix default value of StringTrimmingCharacter.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: b1237257f086649a204a301c996c29e269a1e7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1237257f086649a204a301c9… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 15 16:22:35 2007 -0700 gdiplus: Fix default value of StringTrimmingCharacter. --- dlls/gdiplus/stringformat.c | 1 + dlls/gdiplus/tests/stringformat.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 6b20d23..e328ffb 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -40,6 +40,7 @@ GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, (*format)->attr = attr; (*format)->lang = lang; + (*format)->trimming = StringTrimmingCharacter; return Ok; } diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index 65bec83..9cf46a4 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -43,8 +43,7 @@ static void test_constructor(void) expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); expect(StringAlignmentNear, align); - todo_wine - expect(StringTrimmingCharacter, trimming); + expect(StringTrimmingCharacter, trimming); stat = GdipDeleteStringFormat(format); expect(Ok, stat);

1 0

Juan Lang : crypt32: Free default chain engine.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 1626da2bbaacb5aefc71f9281f025bfd7ccb33c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1626da2bbaacb5aefc71f9281… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 15 16:22:43 2007 -0700 crypt32: Free default chain engine. --- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/main.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index a7bd2b3..9104b98 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -126,6 +126,7 @@ HCRYPTPROV CRYPT_GetDefaultProvider(void); void crypt_oid_init(HINSTANCE hinst); void crypt_oid_free(void); void crypt_sip_free(void); +void default_chain_engine_free(void); /* Some typedefs that make it easier to abstract which type of context we're * working with. diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 72bdfac..aec288d 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -44,6 +44,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved) case DLL_PROCESS_DETACH: crypt_oid_free(); crypt_sip_free(); + default_chain_engine_free(); if (hDefProv) CryptReleaseContext(hDefProv, 0); break; }

1 0

Juan Lang : wintrust: Remove redundant check of pbSignedDataMsg (Coverity).
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: cf3535351ac00e2572388f874fa7d8d47a58f8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3535351ac00e2572388f874… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 15 16:41:32 2007 -0700 wintrust: Remove redundant check of pbSignedDataMsg (Coverity). --- dlls/wintrust/crypt.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 119052b..e69db9e 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -233,9 +233,7 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn &len); if (!ret) goto error; - if (!pbSignedDataMsg) - *pcbSignedDataMsg = pCert->dwLength; - else if (*pcbSignedDataMsg < pCert->dwLength) + if (*pcbSignedDataMsg < pCert->dwLength) { *pcbSignedDataMsg = pCert->dwLength; SetLastError(ERROR_INSUFFICIENT_BUFFER);

1 0

Mikołaj Zalewski : wininet: Support HTTP_QUERY_RAW_HEADER_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: ab7d17727c38b3e3acebac1fa4ad10f212a0f7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7d17727c38b3e3acebac1fa… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Aug 15 16:29:58 2007 -0700 wininet: Support HTTP_QUERY_RAW_HEADER_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS. --- dlls/wininet/http.c | 28 +++++++++++++++++++++------- dlls/wininet/tests/http.c | 14 ++++++++++++++ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 33cfbb5..50fbf5a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1664,19 +1664,33 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev case HTTP_QUERY_RAW_HEADERS_CRLF: { - DWORD len = strlenW(lpwhr->lpszRawHeaders); + LPWSTR headers; + DWORD len; + BOOL ret; + + if (request_only) + headers = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, FALSE); + else + headers = lpwhr->lpszRawHeaders; + + len = strlenW(headers); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) { *lpdwBufferLength = (len + 1) * sizeof(WCHAR); INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - memcpy(lpBuffer, lpwhr->lpszRawHeaders, (len+1)*sizeof(WCHAR)); - *lpdwBufferLength = len * sizeof(WCHAR); + ret = FALSE; + } else + { + memcpy(lpBuffer, headers, (len+1)*sizeof(WCHAR)); + *lpdwBufferLength = len * sizeof(WCHAR); - TRACE("returning data: %s\n", debugstr_wn((WCHAR*)lpBuffer, len)); + TRACE("returning data: %s\n", debugstr_wn((WCHAR*)lpBuffer, len)); + ret = TRUE; + } - return TRUE; + if (request_only) + HeapFree(GetProcessHeap(), 0, headers); + return ret; } case HTTP_QUERY_RAW_HEADERS: { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b8d391c..00f417d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -983,11 +983,25 @@ static void HttpHeaders_test(void) buffer,&len,&index),"Unable to query header\n"); ok(index == 1, "Index was not incremented\n"); ok(strcmp(buffer,"test1")==0, "incorrect string was returned(%s)\n",buffer); + ok(len == 5, "Invalid length (exp. 5, got %d)\n", len); + ok(buffer[len] == 0, "Buffer not NULL-terminated\n"); /* len show only 5 characters but the buffer is NULL-terminated*/ len = sizeof(buffer); strcpy(buffer,"Warning"); ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Second Index Should Not Exist\n"); + /* a working query */ + index = 0; + len = sizeof(buffer); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, + buffer,&len,&index),"Unable to query header\n"); + /* what's in the middle differs between Wine and Windows so currently we check only the beginning and the end */ + ok(strncmp(buffer, "POST /posttest.php HTTP/1", 25)==0, "Invalid beginning of headers string\n"); + ok(strcmp(buffer + strlen(buffer) - 4, "\r\n\r\n")==0, "Invalid end of headers string\n"); + ok(index == 0, "Index was incremented\n"); + + + ok(HttpAddRequestHeaders(hRequest,"Warning:test2",-1,HTTP_ADDREQ_FLAG_ADD), "Failed to add duplicate header using HTTP_ADDREQ_FLAG_ADD\n");

1 0

Mikołaj Zalewski : wininet: Make HttpQueryInfo[AW] work for lpBuffer == NULL and len > 0.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 3fa49f0f0273345cbe030ab8a45de5176e153007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa49f0f0273345cbe030ab8a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Aug 15 16:55:15 2007 -0700 wininet: Make HttpQueryInfo[AW] work for lpBuffer == NULL and len > 0. --- dlls/wininet/http.c | 20 +++++++++++++++----- dlls/wininet/tests/http.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 50fbf5a..9ddd885 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1973,6 +1973,8 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel, goto lend; } + if (lpBuffer == NULL) + *lpdwBufferLength = 0; bSuccess = HTTP_HttpQueryInfoW( lpwhr, dwInfoLevel, lpBuffer, lpdwBufferLength, lpdwIndex); @@ -2008,11 +2010,19 @@ BOOL WINAPI HttpQueryInfoA(HINTERNET hHttpRequest, DWORD dwInfoLevel, lpdwBufferLength, lpdwIndex ); } - len = (*lpdwBufferLength)*sizeof(WCHAR); - bufferW = HeapAlloc( GetProcessHeap(), 0, len ); - /* buffer is in/out because of HTTP_QUERY_CUSTOM */ - if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM) - MultiByteToWideChar(CP_ACP,0,lpBuffer,-1,bufferW,len); + if (lpBuffer) + { + len = (*lpdwBufferLength)*sizeof(WCHAR); + bufferW = HeapAlloc( GetProcessHeap(), 0, len ); + /* buffer is in/out because of HTTP_QUERY_CUSTOM */ + if ((dwInfoLevel & HTTP_QUERY_HEADER_MASK) == HTTP_QUERY_CUSTOM) + MultiByteToWideChar(CP_ACP,0,lpBuffer,-1,bufferW,len); + } else + { + bufferW = NULL; + len = 0; + } + result = HttpQueryInfoW( hHttpRequest, dwInfoLevel, bufferW, &len, lpdwIndex ); if( result ) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 00f417d..d16d93d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -990,6 +990,37 @@ static void HttpHeaders_test(void) ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Second Index Should Not Exist\n"); + + /* a call with NULL will fail but will return the length */ + index = 0; + len = sizeof(buffer); + SetLastError(0xdeadbeef); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, + NULL,&len,&index) == FALSE,"Query worked\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(len > 40, "Invalid length (exp. more than 40, got %d)\n", len); + ok(index == 0, "Index was incremented\n"); + + /* even for a len that is too small */ + index = 0; + len = 15; + SetLastError(0xdeadbeef); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, + NULL,&len,&index) == FALSE,"Query worked\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(len > 40, "Invalid length (exp. more than 40, got %d)\n", len); + ok(index == 0, "Index was incremented\n"); + + index = 0; + len = 0; + SetLastError(0xdeadbeef); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, + NULL,&len,&index) == FALSE,"Query worked\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(len > 40, "Invalid length (exp. more than 40, got %d)\n", len); + ok(index == 0, "Index was incremented\n"); + + /* a working query */ index = 0; len = sizeof(buffer);

1 0

Mikołaj Zalewski : wininet: A small test for HttpQueryInfoA.
by Alexandre Julliard 16 Aug '07

16 Aug '07

Module: wine Branch: master Commit: 5cdfee8153cfe391843486a19f854087d8f39014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdfee8153cfe391843486a19… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Aug 15 16:56:43 2007 -0700 wininet: A small test for HttpQueryInfoA. --- dlls/wininet/tests/http.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d16d93d..f76d88d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -990,6 +990,13 @@ static void HttpHeaders_test(void) ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Second Index Should Not Exist\n"); + index = 0; + len = 5; /* could store the string but not the NULL terminator */ + strcpy(buffer,"Warning"); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, + buffer,&len,&index) == FALSE,"Query succeeded on a too small buffer\n"); + ok(strcmp(buffer,"Warning")==0, "incorrect string was returned(%s)\n",buffer); /* string not touched */ + ok(len == 6, "Invalid length (exp. 6, got %d)\n", len); /* unlike success, the length includes the NULL-terminator */ /* a call with NULL will fail but will return the length */ index = 0;

1 0