October 2015 - Wine-commits

André Hentschel : wineboot: Remove unused macro.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 645ffcbdd3921324634b8469ab33e510baf811a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645ffcbdd3921324634b8469a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 3 20:24:01 2015 +0200 wineboot: Remove unused macro. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/wineboot/wineboot.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index cf0c741..1477287 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -85,8 +85,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); -#define MAX_LINE_LENGTH (2*MAX_PATH+2) - extern BOOL shutdown_close_windows( BOOL force ); extern BOOL shutdown_all_desktops( BOOL force ); extern void kill_processes( BOOL kill_desktop );

1 0

Jacek Caban : mshtml: Fixed comparing names in find_http_header.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: a68d5d2da350aa86cd798e0eeaecd3ffbc5eac6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68d5d2da350aa86cd798e0ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 5 15:50:27 2015 +0200 mshtml: Fixed comparing names in find_http_header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index a661c4d..45ad55f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -363,7 +363,7 @@ static http_header_t *find_http_header(struct list *headers, const WCHAR *name, http_header_t *iter; LIST_FOR_EACH_ENTRY(iter, headers, http_header_t, entry) { - if(!strcmpiW(iter->header, name)) + if(!strncmpiW(iter->header, name, len) && !iter->header[len]) return iter; }

1 0

Jacek Caban : mshtml: Use proper name for OnRedirectVerifyCallback implementation.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: a42816073e44113e7a4bad5688e11e9c1a43d0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42816073e44113e7a4bad568… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 5 15:50:34 2015 +0200 mshtml: Use proper name for OnRedirectVerifyCallback implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index b324160..ed61ab0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1137,7 +1137,7 @@ static nsrefcnt NSAPI nsAsyncVerifyRedirectCallback_Release(nsIAsyncVerifyRedire return ref; } -static nsresult NSAPI nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect(nsIAsyncVerifyRedirectCallback *iface, nsresult result) +static nsresult NSAPI nsAsyncVerifyRedirectCallback_OnRedirectVerifyCallback(nsIAsyncVerifyRedirectCallback *iface, nsresult result) { nsRedirectCallback *This = impl_from_nsIAsyncVerifyRedirectCallback(iface); nsChannel *old_nschannel; @@ -1184,7 +1184,7 @@ static const nsIAsyncVerifyRedirectCallbackVtbl nsAsyncVerifyRedirectCallbackVtb nsAsyncVerifyRedirectCallback_QueryInterface, nsAsyncVerifyRedirectCallback_AddRef, nsAsyncVerifyRedirectCallback_Release, - nsAsyncVerifyRedirectCallback_AsyncOnChannelRedirect + nsAsyncVerifyRedirectCallback_OnRedirectVerifyCallback }; static HRESULT create_redirect_callback(nsChannel *nschannel, nsChannelBSC *bsc, nsRedirectCallback **ret)

1 0

Hans Leidekker : wininet: Set Content-Length header to zero if the verb is CONNECT.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: d050343c502202e1abdabdb37668684031d5367d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d050343c502202e1abdabdb37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 2 15:06:36 2015 +0200 wininet: Set Content-Length header to zero if the verb is CONNECT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/http.c | 25 ++++++++++++++++++++----- dlls/wininet/tests/http.c | 26 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index edea9f8..143dc75 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4877,6 +4877,16 @@ static char *build_ascii_request( const WCHAR *str, void *data, DWORD data_len, return ret; } +static void set_content_length_header( http_request_t *request, DWORD len, DWORD flags ) +{ + static const WCHAR fmtW[] = + {'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','u','\r','\n',0}; + WCHAR buf[sizeof(fmtW)/sizeof(fmtW[0]) + 10]; + + sprintfW( buf, fmtW, len ); + HTTP_HttpAddRequestHeadersW( request, buf, ~0u, flags ); +} + /*********************************************************************** * HTTP_HttpSendRequestW (internal) * @@ -4891,12 +4901,9 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength, BOOL bEndRequest) { - static const WCHAR szContentLength[] = - { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; BOOL redirected = FALSE, secure_proxy_connect = FALSE, loop_next; LPWSTR requestString = NULL; INT responseLen, cnt; - WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \r\n */ + 20 /* int */ ]; DWORD res; TRACE("--> %p\n", request); @@ -4912,8 +4919,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (dwContentLength || strcmpW(request->verb, szGET)) { - sprintfW(contentLengthStr, szContentLength, dwContentLength); - HTTP_HttpAddRequestHeadersW(request, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD_IF_NEW); + set_content_length_header(request, dwContentLength, HTTP_ADDREQ_FLAG_ADD_IF_NEW); request->bytesToWrite = dwContentLength; } if (request->session->appInfo->agent) @@ -5002,6 +5008,10 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, { static const WCHAR connectW[] = {'C','O','N','N','E','C','T',0}; const WCHAR *target = request->server->host_port; + + if (HTTP_GetCustomHeaderIndex(request, szContent_Length, 0, TRUE) >= 0) + set_content_length_header(request, 0, HTTP_ADDREQ_FLAG_REPLACE); + requestString = build_request_header(request, connectW, target, g_szHttp1_1, TRUE); } else if (request->proxy && !(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) @@ -5011,7 +5021,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, heap_free(url); } else + { + if (request->proxy && HTTP_GetCustomHeaderIndex(request, szContent_Length, 0, TRUE) >= 0) + set_content_length_header(request, dwContentLength, HTTP_ADDREQ_FLAG_REPLACE); + requestString = build_request_header(request, request->verb, request->path, request->version, TRUE); + } TRACE("Request header -> %s\n", debugstr_w(requestString) ); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 973413a..410865d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2106,6 +2106,13 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "CONNECT ")) + { + if (!strstr(buffer, "Content-Length: 0")) + send(c, notokmsg, sizeof notokmsg-1, 0); + else + send(c, proxymsg, sizeof proxymsg-1, 0); + } if (strstr(buffer, "/test2")) { if (strstr(buffer, "Proxy-Authorization: Basic bWlrZToxMTAx")) @@ -2806,6 +2813,25 @@ static void test_proxy_direct(int port) ok(r, "HttpQueryInfo failed\n"); ok(!strcmp(buffer, "200"), "proxy code wrong\n"); + InternetCloseHandle(hr); + InternetCloseHandle(hc); + InternetCloseHandle(hi); + + sprintf(buffer, "localhost:%d\n", port); + hi = InternetOpenA("winetest", INTERNET_OPEN_TYPE_PROXY, buffer, NULL, 0); + ok(hi != NULL, "InternetOpen failed\n"); + + hc = InternetConnectA(hi, "test.winehq.org", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(hc != NULL, "InternetConnect failed\n"); + + hr = HttpOpenRequestA(hc, "POST", "/test2", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); + ok(hr != NULL, "HttpOpenRequest failed\n"); + + r = HttpSendRequestA(hr, NULL, 0, (char *)"data", sizeof("data")); + ok(r, "HttpSendRequest failed %u\n", GetLastError()); + + test_status_code(hr, 407); + done: InternetCloseHandle(hr); InternetCloseHandle(hc);

1 0

Nikolay Sivov : gdi32: Implement GetFontFileInfo().
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 6f7dfe2cea4fdb9b61775023659193421c920278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7dfe2cea4fdb9b617750236… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 4 12:48:48 2015 +0300 gdi32: Implement GetFontFileInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/freetype.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/gdi32.spec | 1 + dlls/gdi32/tests/font.c | 19 ++++++++++--- 3 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index de40d9f..33e196c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -364,6 +364,12 @@ typedef struct { GdiFont *font; } CHILD_FONT; +struct font_fileinfo { + FILETIME writetime; + LARGE_INTEGER size; + WCHAR path[1]; +}; + struct tagGdiFont { struct list entry; struct list unused_entry; @@ -400,6 +406,7 @@ struct tagGdiFont { const VOID *vert_feature; DWORD cache_num; DWORD instance_id; + struct font_fileinfo *fileinfo; }; typedef struct { @@ -4505,6 +4512,7 @@ static void free_font(GdiFont *font) HeapFree(GetProcessHeap(), 0, child); } + HeapFree(GetProcessHeap(), 0, font->fileinfo); free_font_handle(font->instance_id); if (font->ft_face) pFT_Done_Face(font->ft_face); if (font->mapping) unmap_font_file( font->mapping ); @@ -5161,6 +5169,29 @@ static const VOID * get_GSUB_vert_feature(const GdiFont *font) return feature; } +static void fill_fileinfo_from_face( GdiFont *font, Face *face ) +{ + WIN32_FILE_ATTRIBUTE_DATA info; + int len; + + if (!face->file) + { + font->fileinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font->fileinfo)); + return; + } + + len = strlenW(face->file); + font->fileinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); + if (GetFileAttributesExW(face->file, GetFileExInfoStandard, &info)) + { + font->fileinfo->writetime = info.ftLastWriteTime; + font->fileinfo->size.QuadPart = (LONGLONG)info.nFileSizeHigh << 32 | info.nFileSizeLow; + strcpyW(font->fileinfo->path, face->file); + } + else + memset(&font->fileinfo, 0, sizeof(*font->fileinfo) + len * sizeof(WCHAR)); +} + /************************************************************* * freetype_SelectFont */ @@ -5555,6 +5586,7 @@ found_face: goto done; } + fill_fileinfo_from_face( ret, face ); ret->ntmFlags = face->ntmFlags; pick_charmap( ret->ft_face, ret->charset ); @@ -8238,7 +8270,7 @@ static BOOL freetype_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) return dev->funcs->pGetFontRealizationInfo( dev, ptr ); } - FIXME("(%p, %p): stub!\n", physdev->font, info); + TRACE("(%p, %p)\n", physdev->font, info); info->flags = 1; if(FT_IS_SCALABLE(physdev->font->ft_face)) @@ -8256,6 +8288,33 @@ static BOOL freetype_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) } /************************************************************************* + * GetFontFileInfo (GDI32.@) + */ +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed ) +{ + struct font_handle_entry *entry = handle_entry( instance_id ); + const GdiFont *font; + + if (!entry) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + font = entry->obj; + *needed = sizeof(*info) + strlenW(font->fileinfo->path) * sizeof(WCHAR); + if (*needed > size) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + /* path is included too */ + memcpy(info, font->fileinfo, *needed); + return TRUE; +} + +/************************************************************************* * Kerning support for TrueType fonts */ #define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') @@ -8644,6 +8703,8 @@ static const struct gdi_dc_funcs freetype_funcs = #else /* HAVE_FREETYPE */ +struct font_fileinfo; + /*************************************************************************/ BOOL WineEngInit(void) @@ -8687,4 +8748,13 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) return TRUE; } +/************************************************************************* + * GetFontFileInfo (GDI32.@) + */ +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed) +{ + *needed = 0; + return FALSE; +} + #endif /* HAVE_FREETYPE */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 8bba686..7d837f6 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -279,6 +279,7 @@ @ stdcall GetEnhMetaFileW(wstr) # @ stub GetFontAssocStatus @ stdcall GetFontData(long long long ptr long) +@ stdcall GetFontFileInfo(long long ptr long ptr) @ stdcall GetFontLanguageInfo(long) @ stdcall GetFontRealizationInfo(long ptr) @ stub GetFontResourceInfo diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index dff0eb6..c7dd6e1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4177,14 +4177,14 @@ static void test_RealizationInfo(void) ok((info[0] & 0xf) == 1, "info[0] = %x for the system font\n", info[0]); ok(info[3] == 0xcccccccc, "structure longer than 3 dwords\n"); - if (!is_truetype_font_installed("Arial")) + if (!is_truetype_font_installed("Tahoma")) { skip("skipping GdiRealizationInfo with truetype font\n"); goto end; } memset(&lf, 0, sizeof(lf)); - strcpy(lf.lfFaceName, "Arial"); + strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; lf.lfWeight = FW_NORMAL; hfont = CreateFontIndirectA(&lf); @@ -4238,12 +4238,19 @@ static void test_RealizationInfo(void) ok(info2[6] == 0xcccccccc, "structure longer than 6 dwords\n"); /* Test GetFontFileInfo() */ - if (pGetFontFileInfo) { + /* invalid font id */ + SetLastError(0xdeadbeef); + r = pGetFontFileInfo(0xabababab, 0, &file_info, sizeof(file_info), &needed); + ok(r == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "ret %d gle %d\n", r, GetLastError()); + + needed = 0; r = pGetFontFileInfo(fri->instance_id, 0, &file_info, sizeof(file_info), &needed); ok(r != 0 || GetLastError() == ERROR_NOACCESS, "ret %d gle %d\n", r, GetLastError()); if (r) { + ok(needed > 0 && needed < sizeof(file_info), "got needed size %u\n", needed); + h = CreateFileW(file_info.path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); ok(h != INVALID_HANDLE_VALUE, "Unable to open file %d\n", GetLastError()); @@ -4256,8 +4263,14 @@ static void test_RealizationInfo(void) ReadFile(h, file, sizeof(file), &read, NULL); CloseHandle(h); have_file = TRUE; + + /* shorter buffer */ + SetLastError(0xdeadbeef); + r = pGetFontFileInfo(fri->instance_id, 0, &file_info, needed - 1, &needed); + ok(r == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "ret %d gle %d\n", r, GetLastError()); } + if (pGetFontFileData) { /* Get bytes 2 - 16 using GetFontFileData */ r = pGetFontFileData(fri->instance_id, 0, 2, data, sizeof(data)); ok(r != 0, "ret 0 gle %d\n", GetLastError());

1 0

André Hentschel : wineboot: Move a function call after a possible return.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 30c5f3bd6322fd86fb20416861ceab1227a04607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c5f3bd6322fd86fb2041686… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 4 21:18:32 2015 +0200 wineboot: Move a function call after a possible return. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/wineboot/wineboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4d70ea9..cf0c741 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -321,10 +321,10 @@ static void create_environment_registry_keys( void ) WCHAR buffer[60]; const WCHAR *arch; - NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); - if (RegCreateKeyW( HKEY_LOCAL_MACHINE, EnvironW, &env_key )) return; + NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); + sprintfW( buffer, PercentDW, NtCurrentTeb()->Peb->NumberOfProcessors ); set_reg_value( env_key, NumProcW, buffer );

1 0

Nikolay Sivov : riched20: Handle invalid HFONT values passed to WM_SETFONT.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 20f4a9ff7b1cf4f4e2ddfc11f4fce44293268e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f4a9ff7b1cf4f4e2ddfc11f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 5 00:40:16 2015 +0300 riched20: Handle invalid HFONT values passed to WM_SETFONT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/riched20/editor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a55a109..ae4a3ab 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3767,7 +3767,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (!wParam) wParam = (WPARAM)GetStockObject(SYSTEM_FONT); - GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf); + + if (!GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf)) + return 0; + hDC = ITextHost_TxGetDC(editor->texthost); ME_CharFormatFromLogFont(hDC, &lf, &fmt); ITextHost_TxReleaseDC(editor->texthost, hDC);

1 0

Sebastian Lackner : msvcrt: Pass cookie reference to msvcrt_local_unwind4 instead of value.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 4e941a9289d755df05aafd51e4e031fb1788a667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e941a9289d755df05aafd51e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Oct 5 00:03:54 2015 +0200 msvcrt: Pass cookie reference to msvcrt_local_unwind4 instead of value. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/msvcrt/except_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 6cbb758..1625854 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -1127,7 +1127,7 @@ void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp) */ void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp) { - msvcrt_local_unwind4( (void *)jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, + msvcrt_local_unwind4( (ULONG *)&jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel, (void *)jmp->Ebp ); }

1 0

Michael Müller : kernel32: Make WritePrivateProfileStringA hotpatchable.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: 132b5f86ceece0ae8d55a6ea184bdf8794ac92e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132b5f86ceece0ae8d55a6ea1… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Oct 5 00:25:03 2015 +0200 kernel32: Make WritePrivateProfileStringA hotpatchable. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/kernel32/profile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index a9a11b1..aad3ba3 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1402,8 +1402,8 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, /*********************************************************************** * WritePrivateProfileStringA (KERNEL32.@) */ -BOOL WINAPI WritePrivateProfileStringA( LPCSTR section, LPCSTR entry, - LPCSTR string, LPCSTR filename ) +BOOL WINAPI DECLSPEC_HOTPATCH WritePrivateProfileStringA( LPCSTR section, LPCSTR entry, + LPCSTR string, LPCSTR filename ) { UNICODE_STRING sectionW, entryW, stringW, filenameW; BOOL ret;

1 0

Michael Müller : gdi32: Make BitBlt and StretchDIBits hotpatchable.
by Alexandre Julliard 05 Oct '15

05 Oct '15

Module: wine Branch: master Commit: cde2fbb08e2810572ed393afb2f7939959eb3bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde2fbb08e2810572ed393afb… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Oct 5 00:30:41 2015 +0200 gdi32: Make BitBlt and StretchDIBits hotpatchable. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/gdi32/bitblt.c | 4 ++-- dlls/gdi32/dib.c | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 08ebfd9..d427070 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -559,8 +559,8 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop /*********************************************************************** * BitBlt (GDI32.@) */ -BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, - INT height, HDC hdcSrc, INT xSrc, INT ySrc, DWORD rop ) +BOOL WINAPI DECLSPEC_HOTPATCH BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, + INT height, HDC hdcSrc, INT xSrc, INT ySrc, DWORD rop ) { if (!rop_uses_src( rop )) return PatBlt( hdcDst, xDst, yDst, width, height, rop ); else return StretchBlt( hdcDst, xDst, yDst, width, height, diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 708a9a8..2817ede 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -59,6 +59,8 @@ Search for "Bitmap Structures" in MSDN */ +#include "config.h" + #include <stdarg.h> #include <stdlib.h> #include <string.h> @@ -602,9 +604,10 @@ done: /*********************************************************************** * StretchDIBits (GDI32.@) */ -INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst, INT heightDst, - INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, - const BITMAPINFO *bmi, UINT coloruse, DWORD rop ) +INT WINAPI DECLSPEC_HOTPATCH StretchDIBits( HDC hdc, INT xDst, INT yDst, INT widthDst, INT heightDst, + INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, + const void *bits, const BITMAPINFO *bmi, UINT coloruse, + DWORD rop ) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *info = (BITMAPINFO *)buffer;

1 0