wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Sven Baars : winhlp32: Fix Dutch translation.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 9ce0ae1febe66706f0fdc6c798ba34a252947e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce0ae1febe66706f0fdc6c79… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 25 17:49:13 2010 +0200 winhlp32: Fix Dutch translation. --- programs/winhlp32/Nl.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc index 029d582..4988326 100644 --- a/programs/winhlp32/Nl.rc +++ b/programs/winhlp32/Nl.rc @@ -31,7 +31,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENUITEM "&Openen", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "Af&drukken", MNID_FILE_PRINT - MENUITEM "&Printerinstellingen...", MNID_FILE_SETUP + MENUITEM "&Pagina-instellingen...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "&Afsluiten", MNID_FILE_EXIT } @@ -50,7 +50,7 @@ MAIN_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENUITEM "Zichtbaar", MNID_OPTS_HELP_VISIBLE MENUITEM "Niet zichtbaar", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "Historie", MNID_OPTS_HISTORY + MENUITEM "Geschiedenis", MNID_OPTS_HISTORY POPUP "Lettertype" BEGIN MENUITEM "Klein", MNID_OPTS_FONTS_SMALL @@ -102,7 +102,7 @@ STID_ALL_FILES, "Alle bestanden (*.*)" STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)" STID_FILE_NOT_FOUND_s "Kan '%s' niet openen. Wilt u zelf dit bestand zoeken?" STID_NO_RICHEDIT "Kan geen richedit implementatie vinden... Actie afgebroken" -STID_PSH_INDEX, "Help onderwerpen: " +STID_PSH_INDEX, "Help-onderwerpen: " } CONTEXT_MENU MENU LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL @@ -111,8 +111,8 @@ BEGIN BEGIN MENUITEM "Annotering...", MNID_CTXT_ANNOTATE MENUITEM "Kopiëren", MNID_CTXT_COPY - MENUITEM "Print...", MNID_CTXT_PRINT - POPUP "Lettertypes" + MENUITEM "Afdrukken ...", MNID_CTXT_PRINT + POPUP "Lettertype" BEGIN MENUITEM "Klein", MNID_CTXT_FONTS_SMALL MENUITEM "Normaal", MNID_CTXT_FONTS_NORMAL @@ -124,6 +124,6 @@ BEGIN MENUITEM "Zichtbaar", MNID_CTXT_HELP_VISIBLE MENUITEM "Onzichtbaar", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "Gebruik systeem kleuren", MNID_CTXT_SYSTEM_COLORS + MENUITEM "Gebruik systeemkleuren", MNID_CTXT_SYSTEM_COLORS END END

1 0

Alexandre Julliard : atl: Fix formatting of generated class name for 64-bit .
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 4e00948efcc46e5ebb26b3fe181cd27fecf80f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e00948efcc46e5ebb26b3fe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 17:03:35 2010 +0200 atl: Fix formatting of generated class name for 64-bit. --- dlls/atl/atl_main.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 788e4de..f168d54 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -458,8 +458,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA if (!wci->m_wc.lpszClassName) { - static const CHAR szFormat[] = "ATL%08x"; - sprintf(wci->m_szAutoName, szFormat, (UINT)(UINT_PTR)wci); + sprintf(wci->m_szAutoName, "ATL%08lx", (UINT_PTR)wci); TRACE("auto-generated class name %s\n", wci->m_szAutoName); wci->m_wc.lpszClassName = wci->m_szAutoName; } @@ -510,8 +509,8 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { - static const WCHAR szFormat[] = {'A','T','L','%','0','8','x',0}; - sprintfW(wci->m_szAutoName, szFormat, (UINT)(UINT_PTR)wci); + static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; + sprintfW(wci->m_szAutoName, szFormat, (UINT_PTR)wci); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; }

1 0

André Hentschel : atl: Reuse code of AtlModuleRegisterWndClassInfoW for AtlModuleRegisterWndClassInfoA .
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 2d658e656f95070c410db3719ce5d03a4e609daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d658e656f95070c410db3719… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 25 16:51:00 2010 +0200 atl: Reuse code of AtlModuleRegisterWndClassInfoW for AtlModuleRegisterWndClassInfoA. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/atl/atlwin.h | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 27fb171..73d6ae6 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -37,7 +37,7 @@ 43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) 44 stdcall AtlModuleExtractCreateWndData(ptr) 45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) -46 stub AtlModuleRegisterWndClassInfoA +46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) 49 stub AtlRegisterClassCategoriesHelper diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 75f9a11..788e4de 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -439,6 +439,45 @@ HRESULT WINAPI AtlModuleUnregisterServer(_ATL_MODULEW *pm, const CLSID *clsid) } /*********************************************************************** + * AtlModuleRegisterWndClassInfoA [ATL.@] + * + * See AtlModuleRegisterWndClassInfoW. + */ +ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA *wci, WNDPROC *pProc) +{ + ATOM atom; + + FIXME("%p %p %p semi-stub\n", pm, wci, pProc); + + atom = wci->m_atom; + if (!atom) + { + WNDCLASSEXA wc; + + TRACE("wci->m_wc.lpszClassName = %s\n", wci->m_wc.lpszClassName); + + if (!wci->m_wc.lpszClassName) + { + static const CHAR szFormat[] = "ATL%08x"; + sprintf(wci->m_szAutoName, szFormat, (UINT)(UINT_PTR)wci); + TRACE("auto-generated class name %s\n", wci->m_szAutoName); + wci->m_wc.lpszClassName = wci->m_szAutoName; + } + + atom = GetClassInfoExA(pm->m_hInst, wci->m_wc.lpszClassName, &wc); + if (!atom) + atom = RegisterClassExA(&wci->m_wc); + + wci->pWndProc = wci->m_wc.lpfnWndProc; + wci->m_atom = atom; + } + *pProc = wci->pWndProc; + + TRACE("returning 0x%04x\n", atom); + return atom; +} + +/*********************************************************************** * AtlModuleRegisterWndClassInfoW [ATL.@] * * PARAMS diff --git a/dlls/atl/atlwin.h b/dlls/atl/atlwin.h index 4bd1359..386177b 100644 --- a/dlls/atl/atlwin.h +++ b/dlls/atl/atlwin.h @@ -43,7 +43,7 @@ typedef struct _ATL_WNDCLASSINFOW_TAG WCHAR m_szAutoName[14]; } _ATL_WNDCLASSINFOW; -ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOA *wci, WNDPROC *pProc); +ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA *wci, WNDPROC *pProc); ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW *wci, WNDPROC *pProc); HDC WINAPI AtlCreateTargetDC(HDC hdc, DVTARGETDEVICE *ptd);

1 0

Alexandre Julliard : user32/tests: Fix a test failure in desktop mode.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 03b335b92623ec2d5c9a15309a192b4bc2e01977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b335b92623ec2d5c9a15309… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 16:28:04 2010 +0200 user32/tests: Fix a test failure in desktop mode. --- dlls/user32/tests/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 85cbcf6..6d67e5c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -185,7 +185,7 @@ static const struct message WmSWP_ShowOverlappedSeq[] = { { WM_GETTITLEBARINFOEX, sent|optional }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, - { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } };

1 0

Hans Leidekker : wininet: Add tests for setting and retrieving the context value.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 02abc3b216e5ee3243a72472dff6407d73037122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02abc3b216e5ee3243a72472d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:19:58 2010 +0200 wininet: Add tests for setting and retrieving the context value. --- dlls/wininet/tests/http.c | 108 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 0faeb54..93b3877 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2416,6 +2416,113 @@ static void test_HttpQueryInfo(int port) InternetCloseHandle(hi); } +static void test_options(int port) +{ + HINTERNET ses, con, req; + DWORD size, error; + DWORD_PTR ctx; + BOOL ret; + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + SetLastError(0xdeadbeef); + ret = InternetSetOption(ses, INTERNET_OPTION_CONTEXT_VALUE, NULL, 0); + error = GetLastError(); + ok(!ret, "InternetSetOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = InternetSetOption(ses, INTERNET_OPTION_CONTEXT_VALUE, NULL, sizeof(ctx)); + ok(!ret, "InternetSetOption succeeded\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = InternetSetOption(ses, INTERNET_OPTION_CONTEXT_VALUE, &ctx, 0); + ok(!ret, "InternetSetOption succeeded\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + ctx = 1; + ret = InternetSetOption(ses, INTERNET_OPTION_CONTEXT_VALUE, &ctx, sizeof(ctx)); + ok(ret, "InternetSetOption failed %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = InternetQueryOption(ses, INTERNET_OPTION_CONTEXT_VALUE, NULL, NULL); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = InternetQueryOption(ses, INTERNET_OPTION_CONTEXT_VALUE, &ctx, NULL); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + size = 0; + SetLastError(0xdeadbeef); + ret = InternetQueryOption(ses, INTERNET_OPTION_CONTEXT_VALUE, NULL, &size); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + + size = sizeof(ctx); + SetLastError(0xdeadbeef); + ret = InternetQueryOption(NULL, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %u\n", error); + + ctx = 0xdeadbeef; + size = sizeof(ctx); + ret = InternetQueryOption(ses, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + ok(ctx == 1, "expected 1 got %lu\n", ctx); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + ctx = 0xdeadbeef; + size = sizeof(ctx); + ret = InternetQueryOption(con, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + ok(ctx == 0, "expected 0 got %lu\n", ctx); + + ctx = 2; + ret = InternetSetOption(con, INTERNET_OPTION_CONTEXT_VALUE, &ctx, sizeof(ctx)); + ok(ret, "InternetSetOption failed %u\n", GetLastError()); + + ctx = 0xdeadbeef; + size = sizeof(ctx); + ret = InternetQueryOption(con, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + ok(ctx == 2, "expected 2 got %lu\n", ctx); + + req = HttpOpenRequest(con, NULL, "/test1", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ctx = 0xdeadbeef; + size = sizeof(ctx); + ret = InternetQueryOption(req, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + ok(ctx == 0, "expected 0 got %lu\n", ctx); + + ctx = 3; + ret = InternetSetOption(req, INTERNET_OPTION_CONTEXT_VALUE, &ctx, sizeof(ctx)); + ok(ret, "InternetSetOption failed %u\n", GetLastError()); + + ctx = 0xdeadbeef; + size = sizeof(ctx); + ret = InternetQueryOption(req, INTERNET_OPTION_CONTEXT_VALUE, &ctx, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + ok(ctx == 3, "expected 3 got %lu\n", ctx); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_http_connection(void) { struct server_info si; @@ -2451,6 +2558,7 @@ static void test_http_connection(void) test_HttpQueryInfo(si.port); test_HttpSendRequestW(si.port); test_last_error(si.port); + test_options(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Hans Leidekker : wininet: Implement InternetQueryOption( INTERNET_OPTION_CONTEXT_VALUE).
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 67b1eecaf26d854791b3098d6bfa14fb200afc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b1eecaf26d854791b3098d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:19:45 2010 +0200 wininet: Implement InternetQueryOption(INTERNET_OPTION_CONTEXT_VALUE). --- dlls/wininet/internet.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5159687..5b1913a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2357,6 +2357,25 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; case INTERNET_OPTION_POLICY: return ERROR_INVALID_PARAMETER; + case INTERNET_OPTION_CONTEXT_VALUE: + { + if (!hdr) + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + if (!size) + return ERROR_INVALID_PARAMETER; + + if (*size < sizeof(DWORD_PTR)) + { + *size = sizeof(DWORD_PTR); + return ERROR_INSUFFICIENT_BUFFER; + } + if (!buffer) + return ERROR_INVALID_PARAMETER; + + *(DWORD_PTR *)buffer = hdr->dwContext; + *size = sizeof(DWORD_PTR); + return ERROR_SUCCESS; + } } FIXME("Stub for %d\n", option);

1 0

Hans Leidekker : wininet: Pass the object header pointer to INET_QueryOption.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: 80dd367846ffcbe58268b3088caf0059a482c339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80dd367846ffcbe58268b3088… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:19:32 2010 +0200 wininet: Pass the object header pointer to INET_QueryOption. --- dlls/wininet/ftp.c | 6 +++--- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 8 ++++---- dlls/wininet/internet.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 1f03199..80cc6f0 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1176,7 +1176,7 @@ static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffe } } } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) @@ -2395,7 +2395,7 @@ static DWORD FTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *bu return ERROR_SUCCESS; } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static const object_vtbl_t FTPSESSIONVtbl = { @@ -3476,7 +3476,7 @@ static DWORD FTPFINDNEXT_QueryOption(object_header_t *hdr, DWORD option, void *b return ERROR_SUCCESS; } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static DWORD FTPFINDNEXT_FindNextFileW(object_header_t *hdr, void *data) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ac0edea..200d03f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1754,7 +1754,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe } } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size) @@ -4166,7 +4166,7 @@ static DWORD HTTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *b return ERROR_SUCCESS; } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static DWORD HTTPSESSION_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 73e9e66..5159687 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -812,7 +812,7 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe } } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static const object_vtbl_t APPINFOVtbl = { @@ -2194,7 +2194,7 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; } -DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) +DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { static BOOL warn = TRUE; @@ -2388,7 +2388,7 @@ BOOL WINAPI InternetQueryOptionW(HINTERNET hInternet, DWORD dwOption, WININET_Release(hdr); } }else { - res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, TRUE); + res = INET_QueryOption(NULL, dwOption, lpBuffer, lpdwBufferLength, TRUE); } if(res != ERROR_SUCCESS) @@ -2421,7 +2421,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption, WININET_Release(hdr); } }else { - res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, FALSE); + res = INET_QueryOption(NULL, dwOption, lpBuffer, lpdwBufferLength, FALSE); } if(res != ERROR_SUCCESS) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 64bfdaa..07b92d8 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -389,7 +389,7 @@ object_header_t *WININET_AddRef( object_header_t *info ); BOOL WININET_Release( object_header_t *info ); BOOL WININET_FreeHandle( HINTERNET hinternet ); -DWORD INET_QueryOption(DWORD,void*,DWORD*,BOOL); +DWORD INET_QueryOption( object_header_t *, DWORD, void *, DWORD *, BOOL ); time_t ConvertTimeString(LPCWSTR asctime);

1 0

Hans Leidekker : wininet: Implement InternetSetOption( INTERNET_OPTION_CONTEXT_VALUE).
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: ae1f553d2b8e0bb95736a12a28d0e68fdaa8e4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1f553d2b8e0bb95736a12a2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:19:17 2010 +0200 wininet: Implement InternetSetOption(INTERNET_OPTION_CONTEXT_VALUE). --- dlls/wininet/internet.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9e32046..73e9e66 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2561,8 +2561,16 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; } case INTERNET_OPTION_CONTEXT_VALUE: - FIXME("Option INTERNET_OPTION_CONTEXT_VALUE; STUB\n"); - break; + { + if (!lpBuffer || dwBufferLength != sizeof(DWORD_PTR)) + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } + else + lpwhh->dwContext = *(DWORD_PTR *)lpBuffer; + break; + } case INTERNET_OPTION_SECURITY_FLAGS: FIXME("Option INTERNET_OPTION_SECURITY_FLAGS; STUB\n"); break;

1 0

Hans Leidekker : msi: End the search for a directory signature if the parent cannot be found.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: c35856dd09b78abf8142d1cbc02baa20af4292b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35856dd09b78abf8142d1cbc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:19:02 2010 +0200 msi: End the search for a directory signature if the parent cannot be found. --- dlls/msi/appsearch.c | 8 +++++--- dlls/msi/tests/package.c | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 18b95ac..336bfca 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -929,7 +929,8 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU 'D','r','L','o','c','a','t','o','r',' ', 'w','h','e','r','e',' ', 'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; - LPWSTR parentName = NULL, parent = NULL; + LPWSTR parent = NULL; + LPCWSTR parentName; WCHAR path[MAX_PATH]; WCHAR expanded[MAX_PATH]; MSIRECORD *row; @@ -949,14 +950,15 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU } /* check whether parent is set */ - parentName = msi_dup_record_field(row,2); + parentName = MSI_RecordGetString(row, 2); if (parentName) { MSISIGNATURE parentSig; rc = ACTION_AppSearchSigName(package, parentName, &parentSig, &parent); ACTION_FreeSignature(&parentSig); - msi_free(parentName); + if (!parent) + return ERROR_SUCCESS; } sz = MAX_PATH; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ce15c66..d2514ce 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8742,6 +8742,9 @@ static void test_appsearch_drlocator(void) r = add_appsearch_entry(hdb, "'SIGPROP11', 'NewSignature11'"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = add_appsearch_entry(hdb, "'SIGPROP13', 'NewSignature13'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_drlocator_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8800,6 +8803,18 @@ static void test_appsearch_drlocator(void) r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_reglocator_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* parent */ + r = add_reglocator_entry(hdb, "'NewSignature12', 2, 'htmlfile\\shell\\open\\nonexistent', '', 1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* parent is in RegLocator, no path, depth 0, no signature */ + sprintf(path, "'NewSignature13', 'NewSignature12', '', 0"); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_signature_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8906,6 +8921,12 @@ static void test_appsearch_drlocator(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpiA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + size = MAX_PATH; + strcpy(path, "c:\\"); + r = MsiGetPropertyA(hpkg, "SIGPROP13", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!prop[0], "Expected \"\", got \"%s\"\n", prop); + DeleteFileA("FileName1"); DeleteFileA("FileName3.dll"); DeleteFileA("FileName4.dll");

1 0

Hans Leidekker : msi: Add a test for properties updated by a patch.
by Alexandre Julliard 25 May '10

25 May '10

Module: wine Branch: master Commit: c2ce56146991ad2786458101d4e11bd6522b703e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ce56146991ad2786458101d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:18:47 2010 +0200 msi: Add a test for properties updated by a patch. --- dlls/msi/tests/patch.c | 65 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 56af5f8..4de2fd0 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -54,7 +54,8 @@ static const char property_dat[] = "UpgradeCode\t{A2E3D643-4E2C-477F-A309-F76F552D5F43}\n" "ProductLanguage\t1033\n" "ProductName\tmsitest\n" - "ProductVersion\t1.1.1\n"; + "ProductVersion\t1.1.1\n" + "PATCHNEWSUMMARYSUBJECT\tInstaller Database\n"; static const char media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" @@ -708,6 +709,48 @@ static void test_simple_patch( void ) "InstallSource", install_source, &size ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + strcpy( path, CURR_DIR ); + strcat( path, "\\" ); + strcat( path, msifile ); + + r = MsiOpenPackageA( path, &hpackage ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + hdb = MsiGetActiveDatabase( hpackage ); + ok( hdb, "failed to get database handle\n" ); + + query = "SELECT * FROM `Property` where `Property` = 'PATCHNEWPACKAGECODE'"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + + query = "SELECT * FROM `Property` WHERE `Property` = 'PATCHNEWSUMMARYSUBJECT' " + "AND `Value` = 'Installer Database'"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + + MsiCloseHandle( hdb ); + MsiCloseHandle( hpackage ); + r = MsiApplyPatchA( mspfile, NULL, INSTALLTYPE_DEFAULT, NULL ); ok( r == ERROR_SUCCESS || broken( r == ERROR_PATCH_PACKAGE_INVALID ), /* version 2.0 */ "expected ERROR_SUCCESS, got %u\n", r ); @@ -721,10 +764,6 @@ static void test_simple_patch( void ) size = get_pf_file_size( "msitest\\patch.txt" ); ok( size == 1002, "expected 1002, got %u\n", size ); - strcpy( path, CURR_DIR ); - strcat( path, "\\" ); - strcat( path, msifile ); - /* show that MsiOpenPackage applies registered patches */ r = MsiOpenPackageA( path, &hpackage ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); @@ -745,6 +784,22 @@ static void test_simple_patch( void ) MsiCloseHandle( hrec ); MsiViewClose( hview ); MsiCloseHandle( hview ); + + query = "SELECT * FROM `Property` WHERE `Property` = 'PATCHNEWSUMMARYSUBJECT' " + "AND `Value` = 'Installation Database'"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + todo_wine ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hdb ); MsiCloseHandle( hpackage );

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
96
Older →

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 May 2010