wine-commits March 2008

wine-commits@winehq.org

4 participants
1001 discussions

James Hawkins : msi: Deformat the service name and display name when installing the service.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: de4cab20a8be723414461213382014d0229e9af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4cab20a8be7234144612133… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Mar 11 18:08:57 2008 -0500 msi: Deformat the service name and display name when installing the service. --- dlls/msi/action.c | 9 ++++++--- dlls/msi/tests/install.c | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cfef958..2e5b8ee 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4470,7 +4470,8 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) MSIRECORD *row; MSIFILE *file; SC_HANDLE hscm, service = NULL; - LPCWSTR name, disp, comp, depends, pass; + LPCWSTR comp, depends, pass; + LPWSTR name, disp; LPCWSTR load_order, serv_name, key; DWORD serv_type, start_type; DWORD err_control; @@ -4497,8 +4498,8 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) if (depends && *depends) FIXME("Dependency list unhandled!\n"); - name = MSI_RecordGetString(rec, 2); - disp = MSI_RecordGetString(rec, 3); + deformat_string(package, MSI_RecordGetString(rec, 2), &name); + deformat_string(package, MSI_RecordGetString(rec, 3), &disp); serv_type = MSI_RecordGetInteger(rec, 4); err_control = MSI_RecordGetInteger(rec, 6); load_order = MSI_RecordGetString(rec, 7); @@ -4536,6 +4537,8 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) done: CloseServiceHandle(service); CloseServiceHandle(hscm); + msi_free(name); + msi_free(disp); return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 00cd705..0c3ae20 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -146,7 +146,9 @@ static const CHAR property_dat[] = "Property\tValue\n" "Setup\tSetup\n" "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" "AdminProperties\tPOSTADMIN\n" - "ROOTDRIVE\tC:\\\n"; + "ROOTDRIVE\tC:\\\n" + "SERVNAME\tTestService\n" + "SERVDISP\tTestServiceDisp\n"; static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" "s72\ti2\tl255\tL255\tL0\ts72\n" @@ -160,7 +162,7 @@ static const CHAR service_install_dat[] = "ServiceInstall\tName\tDisplayName\tSe "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" "ServiceInstall\tServiceInstall\n" - "TestService\tTestService\tTestService\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\t"; + "TestService\t[SERVNAME]\t[SERVDISP]\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\t"; static const CHAR service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" "s72\tl255\ti2\tL255\tI2\ts72\n"

1 0

Lei Zhang : comctl32: Fix TB_GETSTRING return values.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 7f5c97693e2301918d16577578c237dd81852a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5c97693e2301918d1657757… Author: Lei Zhang <thestig(a)google.com> Date: Tue Mar 11 22:28:37 2008 -0700 comctl32: Fix TB_GETSTRING return values. --- dlls/comctl32/tests/toolbar.c | 8 ++++---- dlls/comctl32/toolbar.c | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 38f14f6..dbe9c58 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1109,14 +1109,14 @@ static void test_getstring(void) r = SendMessage(hToolbar, TB_ADDSTRING, 0, (LPARAM)answer); expect(0, r); r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(0, 0), (LPARAM)NULL); - todo_wine expect(strlen(answer), r); + expect(strlen(answer), r); r = SendMessage(hToolbar, TB_GETSTRINGW, MAKEWPARAM(0, 0), (LPARAM)NULL); - todo_wine expect(strlen(answer), r); + expect(strlen(answer), r); r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(sizeof(str), 0), (LPARAM)str); - todo_wine expect(strlen(answer), r); + expect(strlen(answer), r); expect(0, lstrcmp(answer, str)); r = SendMessage(hToolbar, TB_GETSTRINGW, MAKEWPARAM(sizeof(strW), 0), (LPARAM)strW); - todo_wine expect(strlen(answer), r); + expect(strlen(answer), r); expect(0, lstrcmpW(answerW, strW)); DestroyWindow(hToolbar); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 742e6e7..1bda0cc 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5186,6 +5186,7 @@ TOOLBAR_GetStringA (HWND hwnd, WPARAM wParam, LPARAM lParam) if (iString < infoPtr->nNumStrings) { ret = WideCharToMultiByte(CP_ACP, 0, infoPtr->strings[iString], -1, str, buffersize, NULL, NULL); + ret--; TRACE("returning %s\n", debugstr_a(str)); } @@ -5216,11 +5217,12 @@ TOOLBAR_GetStringW (HWND hwnd, WPARAM wParam, LPARAM lParam) memcpy(str, infoPtr->strings[iString], ret); str[len] = '\0'; } + ret = len; TRACE("returning %s\n", debugstr_w(str)); } else - ERR("String index %d out of range (largest is %d)\n", iString, infoPtr->nNumStrings - 1); + WARN("String index %d out of range (largest is %d)\n", iString, infoPtr->nNumStrings - 1); return ret; }

1 0

Lei Zhang : comctl32: Add tests for TB_GETSTRING, fix NULL pointer access.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 375f60b07af4fec5d16bb5534f52379b61811053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=375f60b07af4fec5d16bb5534… Author: Lei Zhang <thestig(a)google.com> Date: Tue Mar 11 22:27:35 2008 -0700 comctl32: Add tests for TB_GETSTRING, fix NULL pointer access. --- dlls/comctl32/tests/toolbar.c | 35 +++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 7 +++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index b094a4b..38f14f6 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -40,6 +40,8 @@ static BOOL g_fExpectedHotItemOld; static BOOL g_fExpectedHotItemNew; static DWORD g_dwExpectedDispInfoMask; +#define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) + #define check_rect(name, val, exp) ok(val.top == exp.top && val.bottom == exp.bottom && \ val.left == exp.left && val.right == exp.right, "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d)\n", \ val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom); @@ -1088,6 +1090,38 @@ static void test_setrows(void) DestroyWindow(hToolbar); } +static void test_getstring(void) +{ + HWND hToolbar = NULL; + char str[10]; + WCHAR strW[10]; + static const char answer[] = "STR"; + static const WCHAR answerW[] = { 'S','T','R',0 }; + INT r; + + hToolbar = CreateWindowExA(0, TOOLBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandle(NULL), NULL); + ok(hToolbar != NULL, "Toolbar creation problem\n"); + + r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(0, 0), (LPARAM)NULL); + expect(-1, r); + r = SendMessage(hToolbar, TB_GETSTRINGW, MAKEWPARAM(0, 0), (LPARAM)NULL); + expect(-1, r); + r = SendMessage(hToolbar, TB_ADDSTRING, 0, (LPARAM)answer); + expect(0, r); + r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(0, 0), (LPARAM)NULL); + todo_wine expect(strlen(answer), r); + r = SendMessage(hToolbar, TB_GETSTRINGW, MAKEWPARAM(0, 0), (LPARAM)NULL); + todo_wine expect(strlen(answer), r); + r = SendMessage(hToolbar, TB_GETSTRING, MAKEWPARAM(sizeof(str), 0), (LPARAM)str); + todo_wine expect(strlen(answer), r); + expect(0, lstrcmp(answer, str)); + r = SendMessage(hToolbar, TB_GETSTRINGW, MAKEWPARAM(sizeof(strW), 0), (LPARAM)strW); + todo_wine expect(strlen(answer), r); + expect(0, lstrcmpW(answerW, strW)); + + DestroyWindow(hToolbar); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -1122,6 +1156,7 @@ START_TEST(toolbar) test_createtoolbarex(); test_dispinfo(); test_setrows(); + test_getstring(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b14b7a7..742e6e7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5211,8 +5211,11 @@ TOOLBAR_GetStringW (HWND hwnd, WPARAM wParam, LPARAM lParam) { len = min(len, strlenW(infoPtr->strings[iString])); ret = (len+1)*sizeof(WCHAR); - memcpy(str, infoPtr->strings[iString], ret); - str[len] = '\0'; + if (str) + { + memcpy(str, infoPtr->strings[iString], ret); + str[len] = '\0'; + } TRACE("returning %s\n", debugstr_w(str)); }

1 0

Jacek Caban : wininet: Move InternetQueryOption( INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT) to vtbl.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 7e63f95326b27e7a524a018b11a0307454120615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e63f95326b27e7a524a018b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 02:24:23 2008 +0100 wininet: Move InternetQueryOption(INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT) to vtbl. --- dlls/wininet/http.c | 63 ++++++++++++++++++++++++++++++++++++ dlls/wininet/internet.c | 82 ----------------------------------------------- 2 files changed, 63 insertions(+), 82 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index aa8aecd..5ea8a45 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -55,6 +55,7 @@ #define NO_SHLWAPI_GDI #include "shlwapi.h" #include "sspi.h" +#include "wincrypt.h" #include "internet.h" #include "wine/debug.h" @@ -1478,6 +1479,68 @@ static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b return ERROR_SUCCESS; } } + + case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT: { + PCCERT_CONTEXT context; + + if(*size < sizeof(INTERNET_CERTIFICATE_INFOW)) { + *size = sizeof(INTERNET_CERTIFICATE_INFOW); + return ERROR_INSUFFICIENT_BUFFER; + } + + context = (PCCERT_CONTEXT)NETCON_GetCert(&(req->netConnection)); + if(context) { + INTERNET_CERTIFICATE_INFOW *info = (INTERNET_CERTIFICATE_INFOW*)buffer; + DWORD len; + + memset(info, 0, sizeof(INTERNET_CERTIFICATE_INFOW)); + info->ftExpiry = context->pCertInfo->NotAfter; + info->ftStart = context->pCertInfo->NotBefore; + if(unicode) { + len = CertNameToStrW(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, NULL, 0); + info->lpszSubjectInfo = LocalAlloc(0, len*sizeof(WCHAR)); + if(info->lpszSubjectInfo) + CertNameToStrW(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, + info->lpszSubjectInfo, len); + len = CertNameToStrW(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, NULL, 0); + info->lpszIssuerInfo = LocalAlloc(0, len*sizeof(WCHAR)); + if (info->lpszIssuerInfo) + CertNameToStrW(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, + info->lpszIssuerInfo, len); + }else { + INTERNET_CERTIFICATE_INFOA *infoA = (INTERNET_CERTIFICATE_INFOA*)info; + + len = CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, NULL, 0); + infoA->lpszSubjectInfo = LocalAlloc(0, len); + if(infoA->lpszSubjectInfo) + CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, + infoA->lpszSubjectInfo, len); + len = CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, NULL, 0); + infoA->lpszIssuerInfo = LocalAlloc(0, len); + if(infoA->lpszIssuerInfo) + CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, + infoA->lpszIssuerInfo, len); + } + + /* + * Contrary to MSDN, these do not appear to be set. + * lpszProtocolName + * lpszSignatureAlgName + * lpszEncryptionAlgName + * dwKeySize + */ + CertFreeCertificateContext(context); + return ERROR_SUCCESS; + } + } } FIXME("Not implemented option %d\n", option); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 89330f5..d5fbbc1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -59,7 +59,6 @@ #include "winerror.h" #define NO_SHLWAPI_STREAM #include "shlwapi.h" -#include "wincrypt.h" #include "wine/exception.h" @@ -2036,87 +2035,6 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d bSuccess = TRUE; break; - case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT: - if (!lpwhh) - { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (*lpdwBufferLength < sizeof(INTERNET_CERTIFICATE_INFOW)) - { - *lpdwBufferLength = sizeof(INTERNET_CERTIFICATE_INFOW); - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - } - else if (lpwhh->htype == WH_HHTTPREQ) - { - LPWININETHTTPREQW lpwhr; - PCCERT_CONTEXT context; - - lpwhr = (LPWININETHTTPREQW)lpwhh; - context = (PCCERT_CONTEXT)NETCON_GetCert(&(lpwhr->netConnection)); - if (context) - { - LPINTERNET_CERTIFICATE_INFOW info = (LPINTERNET_CERTIFICATE_INFOW)lpBuffer; - DWORD strLen; - - memset(info,0,sizeof(INTERNET_CERTIFICATE_INFOW)); - info->ftExpiry = context->pCertInfo->NotAfter; - info->ftStart = context->pCertInfo->NotBefore; - if (bIsUnicode) - { - strLen = CertNameToStrW(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, - NULL, 0); - info->lpszSubjectInfo = LocalAlloc(0, - strLen * sizeof(WCHAR)); - if (info->lpszSubjectInfo) - CertNameToStrW(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, - info->lpszSubjectInfo, strLen); - strLen = CertNameToStrW(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, - NULL, 0); - info->lpszIssuerInfo = LocalAlloc(0, - strLen * sizeof(WCHAR)); - if (info->lpszIssuerInfo) - CertNameToStrW(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, - info->lpszIssuerInfo, strLen); - } - else - { - LPINTERNET_CERTIFICATE_INFOA infoA = - (LPINTERNET_CERTIFICATE_INFOA)info; - - strLen = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, - NULL, 0); - infoA->lpszSubjectInfo = LocalAlloc(0, strLen); - if (infoA->lpszSubjectInfo) - CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, - infoA->lpszSubjectInfo, strLen); - strLen = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, - NULL, 0); - infoA->lpszIssuerInfo = LocalAlloc(0, strLen); - if (infoA->lpszIssuerInfo) - CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, - infoA->lpszIssuerInfo, strLen); - } - /* - * Contrary to MSDN, these do not appear to be set. - * lpszProtocolName - * lpszSignatureAlgName - * lpszEncryptionAlgName - * dwKeySize - */ - CertFreeCertificateContext(context); - bSuccess = TRUE; - } - } - break; case INTERNET_OPTION_VERSION: { TRACE("INTERNET_OPTION_VERSION\n");

1 0

Jacek Caban : wininet: Move InternetQueryOption( INTERNET_OPTION_DATAFILE_NAME).
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: ce6a2289c6aa859f7c717476b498abd1f7a9819b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6a2289c6aa859f7c717476b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 02:24:06 2008 +0100 wininet: Move InternetQueryOption(INTERNET_OPTION_DATAFILE_NAME). --- dlls/wininet/http.c | 29 +++++++++++++++++++++++++++++ dlls/wininet/internet.c | 45 --------------------------------------------- 2 files changed, 29 insertions(+), 45 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f418293..aa8aecd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1449,6 +1449,35 @@ static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b return ERROR_SUCCESS; } } + + case INTERNET_OPTION_DATAFILE_NAME: { + DWORD req_size; + + TRACE("INTERNET_OPTION_DATAFILE_NAME\n"); + + if(!req->lpszCacheFile) { + *size = 0; + return ERROR_INTERNET_ITEM_NOT_FOUND; + } + + if(unicode) { + req_size = (lstrlenW(req->lpszCacheFile)+1) * sizeof(WCHAR); + if(*size < req_size) + return ERROR_INSUFFICIENT_BUFFER; + + *size = req_size; + memcpy(buffer, req->lpszCacheFile, *size); + return ERROR_SUCCESS; + }else { + req_size = WideCharToMultiByte(CP_ACP, 0, req->lpszCacheFile, -1, NULL, 0, NULL, NULL); + if (req_size > *size) + return ERROR_INSUFFICIENT_BUFFER; + + *size = WideCharToMultiByte(CP_ACP, 0, req->lpszCacheFile, + -1, buffer, *size, NULL, NULL); + return ERROR_SUCCESS; + } + } } FIXME("Not implemented option %d\n", option); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 748c518..89330f5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1872,51 +1872,6 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d FIXME("INTERNET_OPTION_USER_AGENT\n"); break; - case INTERNET_OPTION_DATAFILE_NAME: - { - TRACE("INTERNET_OPTION_DATAFILE_NAME\n"); - if (!lpwhh) - { - WARN("Invalid hInternet handle\n"); - INTERNET_SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (lpwhh->htype == WH_HHTTPREQ) - { - LPWININETHTTPREQW lpreq = (LPWININETHTTPREQW) lpwhh; - DWORD size; - - if(!lpreq->lpszCacheFile) { - *lpdwBufferLength = 0; - INTERNET_SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND); - } - else if(bIsUnicode) - { - size = (lstrlenW(lpreq->lpszCacheFile)+1) * sizeof(WCHAR); - if (*lpdwBufferLength < size) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - memcpy(lpBuffer, lpreq->lpszCacheFile, size); - bSuccess = TRUE; - } - *lpdwBufferLength = size; - } - else - { - size = WideCharToMultiByte(CP_ACP, 0, lpreq->lpszCacheFile, -1, NULL, 0, NULL, NULL); - if (size > *lpdwBufferLength) { - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - }else { - *lpdwBufferLength = WideCharToMultiByte(CP_ACP, 0, lpreq->lpszCacheFile, - -1, lpBuffer, *lpdwBufferLength, NULL, NULL); - bSuccess = TRUE; - } - } - } - break; - } - case INTERNET_OPTION_HTTP_VERSION: { if (*lpdwBufferLength < sizeof(HTTP_VERSION_INFO))

1 0

Jacek Caban : wininet: Move InternetQueryOption(INTERNET_OPTION_URL) to vtbl.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 0e010d83a1e3cef55b1857d7469b62e334d1d519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e010d83a1e3cef55b1857d74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 02:23:48 2008 +0100 wininet: Move InternetQueryOption(INTERNET_OPTION_URL) to vtbl. --- dlls/wininet/http.c | 34 +++++++++++++++++++++++++++++++++ dlls/wininet/internet.c | 48 ----------------------------------------------- 2 files changed, 34 insertions(+), 48 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7e4e780..f418293 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1405,6 +1405,8 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { + WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; + switch(option) { case INTERNET_OPTION_HANDLE_TYPE: TRACE("INTERNET_OPTION_HANDLE_TYPE\n"); @@ -1415,6 +1417,38 @@ static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *b *size = sizeof(DWORD); *(DWORD*)buffer = INTERNET_HANDLE_TYPE_HTTP_REQUEST; return ERROR_SUCCESS; + + case INTERNET_OPTION_URL: { + WCHAR url[INTERNET_MAX_URL_LENGTH]; + HTTPHEADERW *host; + DWORD len; + + static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; + static const WCHAR hostW[] = {'H','o','s','t',0}; + + TRACE("INTERNET_OPTION_URL\n"); + + host = HTTP_GetHeader(req, hostW); + sprintfW(url, formatW, host->lpszValue, req->lpszPath); + TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url)); + + if(unicode) { + len = (strlenW(url)+1) * sizeof(WCHAR); + if(*size < len) + return ERROR_INSUFFICIENT_BUFFER; + + *size = len; + strcpyW(buffer, url); + return ERROR_SUCCESS; + }else { + len = WideCharToMultiByte(CP_ACP, 0, url, -1, buffer, *size, NULL, NULL); + if(len > *size) + return ERROR_INSUFFICIENT_BUFFER; + + *size = len; + return ERROR_SUCCESS; + } + } } FIXME("Not implemented option %d\n", option); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0905c93..748c518 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1868,54 +1868,6 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d break; } - case INTERNET_OPTION_URL: - { - TRACE("INTERNET_OPTION_URL\n"); - - if (!lpwhh) - { - WARN("Invalid hInternet handle\n"); - INTERNET_SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (lpwhh->htype == WH_HHTTPREQ) - { - LPWININETHTTPREQW lpreq = (LPWININETHTTPREQW) lpwhh; - WCHAR url[1023]; - static const WCHAR szFmt[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; - static const WCHAR szHost[] = {'H','o','s','t',0}; - DWORD sizeRequired; - LPHTTPHEADERW Host; - - Host = HTTP_GetHeader(lpreq,szHost); - sprintfW(url,szFmt,Host->lpszValue,lpreq->lpszPath); - TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url)); - if(!bIsUnicode) - { - sizeRequired = WideCharToMultiByte(CP_ACP,0,url,-1, - lpBuffer,*lpdwBufferLength,NULL,NULL); - if (sizeRequired > *lpdwBufferLength) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - bSuccess = TRUE; - *lpdwBufferLength = sizeRequired; - } - else - { - sizeRequired = (lstrlenW(url)+1) * sizeof(WCHAR); - if (*lpdwBufferLength < sizeRequired) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - strcpyW(lpBuffer, url); - bSuccess = TRUE; - } - *lpdwBufferLength = sizeRequired; - } - } - break; - } - case INTERNET_OPTION_USER_AGENT: FIXME("INTERNET_OPTION_USER_AGENT\n"); break;

1 0

Jacek Caban : wininet: Move INTERNET_OPTION_HANDLE_TYPE to vtbl.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: e2933c20d60dedb0a05c6358d9584445cf699591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2933c20d60dedb0a05c6358d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 02:23:20 2008 +0100 wininet: Move INTERNET_OPTION_HANDLE_TYPE to vtbl. --- dlls/wininet/ftp.c | 57 ++++++++++++++++++++++++++++++++++++++++ dlls/wininet/http.c | 37 ++++++++++++++++++++++++++ dlls/wininet/internet.c | 66 ++++++++++++++++++++++++++-------------------- dlls/wininet/internet.h | 1 + 4 files changed, 132 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index b9d305e..76ddbfd 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1215,6 +1215,24 @@ static void FTPFILE_Destroy(WININETHANDLEHEADER *hdr) HeapFree(GetProcessHeap(), 0, lpwh); } +static DWORD FTPFILE_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) +{ + switch(option) { + case INTERNET_OPTION_HANDLE_TYPE: + TRACE("INTERNET_OPTION_HANDLE_TYPE\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *size = sizeof(DWORD); + *(DWORD*)buffer = INTERNET_HANDLE_TYPE_FTP_FILE; + return ERROR_SUCCESS; + } + + FIXME("Not implemented option %d\n", option); + return ERROR_INTERNET_INVALID_OPTION; +} + static DWORD FTPFILE_ReadFile(WININETHANDLEHEADER *hdr, void *buffer, DWORD size, DWORD *read) { WININETFTPFILE *file = (WININETFTPFILE*)hdr; @@ -1244,6 +1262,7 @@ static BOOL FTPFILE_WriteFile(WININETHANDLEHEADER *hdr, const void *buffer, DWOR static const HANDLEHEADERVtbl FTPFILEVtbl = { FTPFILE_Destroy, NULL, + FTPFILE_QueryOption, NULL, FTPFILE_ReadFile, NULL, @@ -2163,9 +2182,28 @@ static void FTPSESSION_CloseConnection(WININETHANDLEHEADER *hdr) INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); } +static DWORD FTPSESSION_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) +{ + switch(option) { + case INTERNET_OPTION_HANDLE_TYPE: + TRACE("INTERNET_OPTION_HANDLE_TYPE\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *size = sizeof(DWORD); + *(DWORD*)buffer = INTERNET_HANDLE_TYPE_CONNECT_FTP; + return ERROR_SUCCESS; + } + + FIXME("Not implemented option %d\n", option); + return ERROR_INTERNET_INVALID_OPTION; +} + static const HANDLEHEADERVtbl FTPSESSIONVtbl = { FTPSESSION_Destroy, FTPSESSION_CloseConnection, + FTPSESSION_QueryOption, NULL, NULL, NULL, @@ -3229,6 +3267,24 @@ static void FTPFINDNEXT_AsyncFindNextFileProc(WORKREQUEST *workRequest) FTPFINDNEXT_FindNextFileProc((WININETFTPFINDNEXTW*)workRequest->hdr, req->lpFindFileData); } +static DWORD FTPFINDNEXT_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) +{ + switch(option) { + case INTERNET_OPTION_HANDLE_TYPE: + TRACE("INTERNET_OPTION_HANDLE_TYPE\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *size = sizeof(DWORD); + *(DWORD*)buffer = INTERNET_HANDLE_TYPE_FTP_FIND; + return ERROR_SUCCESS; + } + + FIXME("Not implemented option %d\n", option); + return ERROR_INTERNET_INVALID_OPTION; +} + static DWORD FTPFINDNEXT_FindNextFileW(WININETHANDLEHEADER *hdr, void *data) { WININETFTPFINDNEXTW *find = (WININETFTPFINDNEXTW*)hdr; @@ -3254,6 +3310,7 @@ static DWORD FTPFINDNEXT_FindNextFileW(WININETHANDLEHEADER *hdr, void *data) static const HANDLEHEADERVtbl FTPFINDNEXTVtbl = { FTPFINDNEXT_Destroy, NULL, + FTPFINDNEXT_QueryOption, NULL, NULL, NULL, diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 638e520..7e4e780 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1403,6 +1403,24 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); } +static DWORD HTTPREQ_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) +{ + switch(option) { + case INTERNET_OPTION_HANDLE_TYPE: + TRACE("INTERNET_OPTION_HANDLE_TYPE\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *size = sizeof(DWORD); + *(DWORD*)buffer = INTERNET_HANDLE_TYPE_HTTP_REQUEST; + return ERROR_SUCCESS; + } + + FIXME("Not implemented option %d\n", option); + return ERROR_INTERNET_INVALID_OPTION; +} + static DWORD HTTPREQ_SetOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD size) { WININETHTTPREQW *req = (WININETHTTPREQW*)hdr; @@ -1589,6 +1607,7 @@ static DWORD HTTPREQ_QueryDataAvailable(WININETHANDLEHEADER *hdr, DWORD *availab static const HANDLEHEADERVtbl HTTPREQVtbl = { HTTPREQ_Destroy, HTTPREQ_CloseConnection, + HTTPREQ_QueryOption, HTTPREQ_SetOption, HTTPREQ_ReadFile, HTTPREQ_ReadFileExA, @@ -3132,10 +3151,28 @@ static void HTTPSESSION_Destroy(WININETHANDLEHEADER *hdr) HeapFree(GetProcessHeap(), 0, lpwhs); } +static DWORD HTTPSESSION_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) +{ + switch(option) { + case INTERNET_OPTION_HANDLE_TYPE: + TRACE("INTERNET_OPTION_HANDLE_TYPE\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *size = sizeof(DWORD); + *(DWORD*)buffer = INTERNET_HANDLE_TYPE_CONNECT_HTTP; + return ERROR_SUCCESS; + } + + FIXME("Not implemented option %d\n", option); + return ERROR_INTERNET_INVALID_OPTION; +} static const HANDLEHEADERVtbl HTTPSESSIONVtbl = { HTTPSESSION_Destroy, NULL, + HTTPSESSION_QueryOption, NULL, NULL, NULL, diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5d8d46c..0905c93 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -471,9 +471,28 @@ static VOID APPINFO_Destroy(WININETHANDLEHEADER *hdr) HeapFree(GetProcessHeap(), 0, lpwai); } +static DWORD APPINFO_QueryOption(WININETHANDLEHEADER *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) +{ + switch(option) { + case INTERNET_OPTION_HANDLE_TYPE: + TRACE("INTERNET_OPTION_HANDLE_TYPE\n"); + + if (*size < sizeof(ULONG)) + return ERROR_INSUFFICIENT_BUFFER; + + *size = sizeof(DWORD); + *(DWORD*)buffer = INTERNET_HANDLE_TYPE_INTERNET; + return ERROR_SUCCESS; + } + + FIXME("Not implemented option %d\n", option); + return ERROR_INTERNET_INVALID_OPTION; +} + static const HANDLEHEADERVtbl APPINFOVtbl = { APPINFO_Destroy, NULL, + APPINFO_QueryOption, NULL, NULL, NULL, @@ -1834,32 +1853,6 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d switch (dwOption) { - case INTERNET_OPTION_HANDLE_TYPE: - { - ULONG type; - - if (!lpwhh) - { - WARN("Invalid hInternet handle\n"); - INTERNET_SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - type = lpwhh->htype; - - TRACE("INTERNET_OPTION_HANDLE_TYPE: %d\n", type); - - if (*lpdwBufferLength < sizeof(ULONG)) - INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - else - { - memcpy(lpBuffer, &type, sizeof(ULONG)); - bSuccess = TRUE; - } - *lpdwBufferLength = sizeof(ULONG); - break; - } - case INTERNET_OPTION_REQUEST_FLAGS: { ULONG flags = 4; @@ -1923,6 +1916,10 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d break; } + case INTERNET_OPTION_USER_AGENT: + FIXME("INTERNET_OPTION_USER_AGENT\n"); + break; + case INTERNET_OPTION_DATAFILE_NAME: { TRACE("INTERNET_OPTION_DATAFILE_NAME\n"); @@ -2272,9 +2269,20 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d FIXME("66\n"); bSuccess = TRUE; break; - default: - FIXME("Stub! %d\n", dwOption); - break; + default: { + if(lpwhh) { + DWORD res; + + res = lpwhh->vtbl->QueryOption(lpwhh, dwOption, lpBuffer, lpdwBufferLength, bIsUnicode); + if(res == ERROR_SUCCESS) + bSuccess = TRUE; + else + SetLastError(res); + }else { + FIXME("Stub! %d\n", dwOption); + break; + } + } } if (lpwhh) WININET_Release( lpwhh ); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 106b054..2645686 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -139,6 +139,7 @@ typedef struct _WININETHANDLEHEADER WININETHANDLEHEADER, *LPWININETHANDLEHEADER; typedef struct { void (*Destroy)(WININETHANDLEHEADER*); void (*CloseConnection)(WININETHANDLEHEADER*); + DWORD (*QueryOption)(WININETHANDLEHEADER*,DWORD,void*,DWORD*,BOOL); DWORD (*SetOption)(WININETHANDLEHEADER*,DWORD,void*,DWORD); DWORD (*ReadFile)(WININETHANDLEHEADER*,void*,DWORD,DWORD*); DWORD (*ReadFileExA)(WININETHANDLEHEADER*,INTERNET_BUFFERSA*,DWORD,DWORD_PTR);

1 0

Jacek Caban : mshtml: Improve header parsing.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: d4cff191b2902e4ee499f949a8ac0780240f9530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4cff191b2902e4ee499f949a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 11 22:28:21 2008 +0100 mshtml: Improve header parsing. --- dlls/mshtml/persist.c | 54 ++++++++++++++---------------------------------- 1 files changed, 16 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 8a629d7..8c0cb3b 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -44,47 +44,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static int fix_headers(char *buf, DWORD post_len) { - char *ptr = NULL; - - if(!strncasecmp(USER_AGENT, buf, sizeof(USER_AGENT)-1)) { - ptr = buf; - }else { - ptr = strstr(buf, "\r\n" USER_AGENT); - if(ptr) - ptr += 2; - } + char *ptr = buf, *ptr2; - if(ptr) { - const char *ptr2; + while(*ptr && (ptr[0] != '\r' || ptr[1] != '\n')) { + for(ptr2=ptr+1; *ptr2 && (ptr2[0] != '\r' || ptr2[1] != '\n'); ptr2++); - FIXME("Ignoring User-Agent header\n"); + if(*ptr2) + ptr2 += 2; - ptr2 = strstr(ptr, "\r\n"); - if(ptr2) + if(!strncasecmp(ptr, USER_AGENT, sizeof(USER_AGENT)-1)) { + FIXME("Ignoring User-Agent header\n"); memmove(ptr, ptr2, strlen(ptr2)+1); - } - - if(!post_len) { - if(!strncasecmp(CONTENT_TYPE, buf, sizeof(CONTENT_TYPE)-1)) { - ptr = buf; - }else { - ptr = strstr(buf, "\r\n" CONTENT_TYPE); - if(ptr) - ptr += 2; - } - - if(ptr) { - const char *ptr2; - + }else if(!post_len && !strncasecmp(ptr, CONTENT_TYPE, sizeof(CONTENT_TYPE)-1)) { TRACE("Ignoring Content-Type header\n"); - - ptr2 = strstr(ptr, "\r\n"); - if(ptr2) - memmove(ptr, ptr2, strlen(ptr2)+1); + memmove(ptr, ptr2, strlen(ptr2)+1); + }else { + ptr = ptr2; } } - return strlen(buf); + *ptr = 0; + return ptr-buf; } static nsIInputStream *get_post_data_stream(IBindCtx *bctx) @@ -159,18 +139,16 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) } if(post_len) { - if(len >= 4 && !strcmp(data+len-4, "\r\n\r\n")) - len -= 2; - sprintf(data+len, content_length, post_len); - len = strlen(data); + len += strlen(data+len); memcpy(data+len, bindinfo.stgmedData.u.hGlobal, post_len); } TRACE("data = %s\n", debugstr_an(data, len+post_len)); - ret = create_nsstream(data, len+post_len); + if(len) + ret = create_nsstream(data, len+post_len); } CoTaskMemFree(headers);

1 0

Andrew Talbot : oleaut32: Assign to structs instead of using memcpy.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 9d16a42210bbd3ac1622c223f96c0267624a308a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d16a42210bbd3ac1622c223f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 11 20:55:17 2008 +0000 oleaut32: Assign to structs instead of using memcpy. --- dlls/oleaut32/olefont.c | 2 +- dlls/oleaut32/olepicture.c | 6 +++--- dlls/oleaut32/recinfo.c | 8 ++++---- dlls/oleaut32/tmarshal.c | 4 ++-- dlls/oleaut32/typelib.c | 13 ++++++------- dlls/oleaut32/ungif.c | 2 +- dlls/oleaut32/variant.c | 8 ++++---- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index b8e4ee2..1a30621 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1556,7 +1556,7 @@ static HRESULT WINAPI OLEFontImpl_GetClassID( if (pClassID==0) return E_POINTER; - memcpy(pClassID, &CLSID_StdFont, sizeof(CLSID_StdFont)); + *pClassID = CLSID_StdFont; return S_OK; } diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 6a2adc9..47b1461 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -316,7 +316,7 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn) newObject->bIsDirty = FALSE; if (pictDesc) { - memcpy(&newObject->desc, pictDesc, sizeof(PICTDESC)); + newObject->desc = *pictDesc; switch(pictDesc->picType) { case PICTYPE_BITMAP: @@ -955,7 +955,7 @@ static HRESULT WINAPI OLEPictureImpl_GetClassID( IPersistStream* iface,CLSID* pClassID) { TRACE("(%p)\n", pClassID); - memcpy(pClassID, &CLSID_StdPicture, sizeof(*pClassID)); + *pClassID = CLSID_StdPicture; return S_OK; } @@ -2077,7 +2077,7 @@ static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) /* Fill out the BITMAPINFOHEADER */ pIconBitmapHeader = (BITMAPINFOHEADER *)(pIconData + 3 * sizeof(WORD) + sizeof(CURSORICONFILEDIRENTRY)); - memcpy(pIconBitmapHeader, &pInfoBitmap->bmiHeader, sizeof(BITMAPINFOHEADER)); + *pIconBitmapHeader = pInfoBitmap->bmiHeader; /* Find out whether a palette exists for the bitmap */ if ( (pInfoBitmap->bmiHeader.biBitCount == 16 && pInfoBitmap->bmiHeader.biCompression == BI_RGB) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 97a9545..cc11153 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -268,7 +268,7 @@ static HRESULT WINAPI IRecordInfoImpl_GetGuid(IRecordInfo *iface, GUID *pguid) if(!pguid) return E_INVALIDARG; - memcpy(pguid, &This->guid, sizeof(GUID)); + *pguid = This->guid; return S_OK; } @@ -557,7 +557,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo if(typeattr->typekind == TKIND_ALIAS) { hres = ITypeInfo_GetRefTypeInfo(pTI, typeattr->tdescAlias.u.hreftype, &pTypeInfo); - memcpy(&guid, &typeattr->guid, sizeof(GUID)); + guid = typeattr->guid; ITypeInfo_ReleaseTypeAttr(pTI, typeattr); if(FAILED(hres)) { WARN("GetRefTypeInfo failed: %08x\n", hres); @@ -567,7 +567,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo }else { pTypeInfo = pTI; ITypeInfo_AddRef(pTypeInfo); - memcpy(&guid, &typeattr->guid, sizeof(GUID)); + guid = typeattr->guid; } if(typeattr->typekind != TKIND_RECORD) { @@ -585,7 +585,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo ret->size = typeattr->cbSizeInstance; ITypeInfo_ReleaseTypeAttr(pTypeInfo, typeattr); - memcpy(&ret->guid, &guid, sizeof(GUID)); + ret->guid = guid; /* NOTE: Windows implementation calls ITypeInfo::GetCantainingTypeLib and * ITypeLib::GetLibAttr, but we currently don't need this. diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 8a6e267..80d435e 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1802,7 +1802,7 @@ PSFacBuf_CreateProxy( /* one reference for the proxy */ proxy->ref = 1; proxy->tinfo = tinfo; - memcpy(&proxy->iid,riid,sizeof(*riid)); + proxy->iid = *riid; proxy->chanbuf = 0; InitializeCriticalSection(&proxy->crit); @@ -2218,7 +2218,7 @@ PSFacBuf_CreateStub( stub->tinfo = tinfo; stub->dispatch_stub = NULL; stub->dispatch_derivative = FALSE; - memcpy(&(stub->iid),riid,sizeof(*riid)); + stub->iid = *riid; hres = IRpcStubBuffer_Connect((LPRPCSTUBBUFFER)stub,pUnkServer); *ppStub = (LPRPCSTUBBUFFER)stub; TRACE("IRpcStubBuffer: %p\n", stub); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index df886a3..f251d70 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3477,8 +3477,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) pOtherTypeInfoBlks[i].name_offs + pNameTable); (*ppTypeInfoImpl)->dwHelpContext = pOtherTypeInfoBlks[i].helpcontext; - memcpy(&((*ppTypeInfoImpl)->TypeAttr.guid), &pOtherTypeInfoBlks[i].uuid, - sizeof(GUID)); + (*ppTypeInfoImpl)->TypeAttr.guid = pOtherTypeInfoBlks[i].uuid; (*ppTypeInfoImpl)->TypeAttr.typekind = pTIHeader->typekind; (*ppTypeInfoImpl)->TypeAttr.wMajorVerNum = pTIHeader->major_version; (*ppTypeInfoImpl)->TypeAttr.wMinorVerNum = pTIHeader->minor_version; @@ -3849,7 +3848,7 @@ static HRESULT WINAPI ITypeLib2_fnGetLibAttr( ITypeLibImpl *This = (ITypeLibImpl *)iface; TRACE("(%p)\n",This); *ppTLibAttr = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppTLibAttr)); - memcpy(*ppTLibAttr, &This->LibAttr, sizeof(**ppTLibAttr)); + **ppTLibAttr = This->LibAttr; return S_OK; } @@ -4589,7 +4588,7 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, if (!*ppTypeAttr) return E_OUTOFMEMORY; - memcpy(*ppTypeAttr, &This->TypeAttr, sizeof(**ppTypeAttr)); + **ppTypeAttr = This->TypeAttr; if (This->TypeAttr.typekind == TKIND_ALIAS) TLB_CopyTypeDesc(&(*ppTypeAttr)->tdescAlias, @@ -4632,14 +4631,14 @@ static SIZE_T TLB_SizeElemDesc( const ELEMDESC *elemdesc ) static HRESULT TLB_CopyElemDesc( const ELEMDESC *src, ELEMDESC *dest, char **buffer ) { - memcpy(dest, src, sizeof(ELEMDESC)); + *dest = *src; *buffer = TLB_CopyTypeDesc(&dest->tdesc, &src->tdesc, *buffer); if (src->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) { const PARAMDESCEX *pparamdescex_src = src->u.paramdesc.pparamdescex; PARAMDESCEX *pparamdescex_dest = dest->u.paramdesc.pparamdescex = (PARAMDESCEX *)*buffer; *buffer += sizeof(PARAMDESCEX); - memcpy(pparamdescex_dest, pparamdescex_src, sizeof(PARAMDESCEX)); + *pparamdescex_dest = *pparamdescex_src; VariantInit(&pparamdescex_dest->varDefaultValue); return VariantCopy(&pparamdescex_dest->varDefaultValue, (VARIANTARG *)&pparamdescex_src->varDefaultValue); @@ -4674,7 +4673,7 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt dest = (FUNCDESC *)SysAllocStringByteLen(NULL, size); if (!dest) return E_OUTOFMEMORY; - memcpy(dest, src, sizeof(FUNCDESC)); + *dest = *src; if (dispinterface) /* overwrite funckind */ dest->funckind = FUNC_DISPATCH; buffer = (char *)(dest + 1); diff --git a/dlls/oleaut32/ungif.c b/dlls/oleaut32/ungif.c index e768978..39b8984 100644 --- a/dlls/oleaut32/ungif.c +++ b/dlls/oleaut32/ungif.c @@ -404,7 +404,7 @@ DGifGetImageDesc(GifFileType * GifFile) { } sp = &GifFile->SavedImages[GifFile->ImageCount]; - memcpy(&sp->ImageDesc, &GifFile->Image, sizeof(GifImageDesc)); + sp->ImageDesc = GifFile->Image; if (GifFile->Image.ColorMap != NULL) { sp->ImageDesc.ColorMap = MakeMapObject( GifFile->Image.ColorMap->ColorCount, diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index ac71445..abfcfcc 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1254,7 +1254,7 @@ INT WINAPI SystemTimeToVariantTime(LPSYSTEMTIME lpSt, double *pDateOut) if (lpSt->wMonth > 12) return FALSE; - memcpy(&ud.st, lpSt, sizeof(ud.st)); + ud.st = *lpSt; return !VarDateFromUdate(&ud, 0, pDateOut); } @@ -1280,7 +1280,7 @@ INT WINAPI VariantTimeToSystemTime(double dateIn, LPSYSTEMTIME lpSt) if (FAILED(VarUdateFromDate(dateIn, 0, &ud))) return FALSE; - memcpy(lpSt, &ud.st, sizeof(ud.st)); + *lpSt = ud.st; return TRUE; } @@ -1312,8 +1312,8 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT if (lcid != MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)) FIXME("lcid possibly not handled, treating as en-us\n"); - - memcpy(&ud, pUdateIn, sizeof(ud)); + + ud = *pUdateIn; if (dwFlags & VAR_VALIDDATE) WARN("Ignoring VAR_VALIDDATE\n");

1 0

Michael Stefaniuc : comctl32/tests: Fix a variable type in monthcal.c. Removes 19 -Wsign-compare warnings.
by Alexandre Julliard 12 Mar '08

12 Mar '08

Module: wine Branch: master Commit: 3ca73da928a91cf7762b60259d5b5eb13aa05a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca73da928a91cf7762b60259… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 00:24:35 2008 +0100 comctl32/tests: Fix a variable type in monthcal.c. Removes 19 -Wsign-compare warnings. --- dlls/comctl32/tests/monthcal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index c056ede..cd9592d 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -719,7 +719,7 @@ static void test_monthcal_unicode(HWND hwnd) static void test_monthcal_HitTest(HWND hwnd) { MCHITTESTINFO mchit; - int res; + UINT res; SYSTEMTIME st; memset(&mchit, 0, sizeof(MCHITTESTINFO)); @@ -911,7 +911,7 @@ static void test_monthcal_todaylink(HWND hwnd) MCHITTESTINFO mchit; SYSTEMTIME st_test, st_new; BOOL error = FALSE; - int res; + UINT res; memset(&mchit, 0, sizeof(MCHITTESTINFO));

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2008