wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Jacek Caban : mshtml: Don' t try forwarding calls to Gecko that are not implemented there anyways.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 604350be8d400bd0dc9fdc72c634bbb4ae1f1016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604350be8d400bd0dc9fdc72c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 3 13:07:57 2011 +0100 mshtml: Don't try forwarding calls to Gecko that are not implemented there anyways. --- dlls/mshtml/nsio.c | 27 ++++++--------------------- 1 files changed, 6 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 492f845..dec00aa 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1850,14 +1850,9 @@ static nsresult NSAPI nsURI_SetHostPort(nsIURL *iface, const nsACString *aHostPo { nsWineURI *This = impl_from_nsIURL(iface); - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aHostPort)); + WARN("(%p)->(%s)\n", This, debugstr_nsacstr(aHostPort)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetHostPort(This->nsuri, aHostPort); - } - - FIXME("default action not implemented\n"); + /* Not implemented by Gecko */ return NS_ERROR_NOT_IMPLEMENTED; } @@ -2159,14 +2154,9 @@ static nsresult NSAPI nsURL_SetParam(nsIURL *iface, const nsACString *aParam) { nsWineURI *This = impl_from_nsIURL(iface); - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aParam)); + WARN("(%p)->(%s)\n", This, debugstr_nsacstr(aParam)); - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetParam(This->nsurl, aParam); - } - - FIXME("default action not implemented\n"); + /* Not implemented by Gecko */ return NS_ERROR_NOT_IMPLEMENTED; } @@ -2274,14 +2264,9 @@ static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirec { nsWineURI *This = impl_from_nsIURL(iface); - TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aDirectory)); + WARN("(%p)->(%s)\n", This, debugstr_nsacstr(aDirectory)); - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetDirectory(This->nsurl, aDirectory); - } - - FIXME("default action not implemented\n"); + /* Not implemented by Gecko */ return NS_ERROR_NOT_IMPLEMENTED; }

1 0

Kusanagi Kouichi : gdi32: Check if a character is double byte or single byte.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 3311bbb3199cc877afbe61f4af3f4d86aa468fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3311bbb3199cc877afbe61f4a… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Feb 3 20:07:06 2011 +0900 gdi32: Check if a character is double byte or single byte. --- dlls/gdi32/font.c | 22 +++++++++------------- dlls/gdi32/tests/font.c | 1 - 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6f1f867..c92b6e3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2495,16 +2495,15 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, LPGLYPHMETRICS lpgm, DWORD cbBuffer, LPVOID lpBuffer, const MAT2 *lpmat2 ) { - LPWSTR p = NULL; - DWORD ret; - UINT c; - if (!lpmat2) return GDI_ERROR; if(!(fuFormat & GGO_GLYPH_INDEX)) { + UINT cp; int len; char mbchs[2]; - if(uChar > 0xff) { /* but, 2 bytes character only */ + + cp = GdiGetCodePage(hdc); + if (IsDBCSLeadByteEx(cp, uChar >> 8)) { len = 2; mbchs[0] = (uChar & 0xff00) >> 8; mbchs[1] = (uChar & 0xff); @@ -2512,14 +2511,11 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, len = 1; mbchs[0] = (uChar & 0xff); } - p = FONT_mbtowc(hdc, mbchs, len, NULL, NULL); - c = p[0]; - } else - c = uChar; - ret = GetGlyphOutlineW(hdc, c, fuFormat, lpgm, cbBuffer, lpBuffer, - lpmat2); - HeapFree(GetProcessHeap(), 0, p); - return ret; + MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1); + } + + return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, + lpmat2); } /*********************************************************************** diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 5b7cb8d..3ea883a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3194,7 +3194,6 @@ static void test_GetGlyphOutline(void) ret = GetGlyphOutlineA(hdc, 0x8041, GGO_BITMAP, &gm, 0, NULL, &mat); ret2 = GetGlyphOutlineA(hdc, 0x41, GGO_BITMAP, &gm2, 0, NULL, &mat); - todo_wine ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2); ret = GetGlyphOutlineA(hdc, c[i].a, GGO_BITMAP, &gm, 0, NULL, &mat);

1 0

Kusanagi Kouichi : gdi32/tests: Add tests for GetGlyphOutlineA.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: c8ebdff8fa4e82abe8f526a00c32db34b490dffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ebdff8fa4e82abe8f526a00… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Feb 3 20:06:59 2011 +0900 gdi32/tests: Add tests for GetGlyphOutlineA. --- dlls/gdi32/tests/font.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f07a427..5b7cb8d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3096,10 +3096,25 @@ todo_wine static void test_GetGlyphOutline(void) { HDC hdc; - GLYPHMETRICS gm; + GLYPHMETRICS gm, gm2; LOGFONTA lf; HFONT hfont, old_hfont; - INT ret; + INT ret, ret2; + static const struct + { + UINT cs; + UINT a; + UINT w; + } c[] = + { + {ANSI_CHARSET, 0x30, 0x30}, + {SHIFTJIS_CHARSET, 0x82a0, 0x3042}, + {HANGEUL_CHARSET, 0x8141, 0xac02}, + {JOHAB_CHARSET, 0x8446, 0x3135}, + {GB2312_CHARSET, 0x8141, 0x4e04}, + {CHINESEBIG5_CHARSET, 0xa142, 0x3001} + }; + UINT i; if (!is_truetype_font_installed("Tahoma")) { @@ -3163,6 +3178,33 @@ static void test_GetGlyphOutline(void) SelectObject(hdc, old_hfont); DeleteObject(hfont); + + for (i = 0; i < sizeof c / sizeof c[0]; ++i) + { + lf.lfFaceName[0] = '\0'; + lf.lfCharSet = c[i].cs; + lf.lfPitchAndFamily = 0; + if (EnumFontFamiliesEx(hdc, &lf, create_font_proc, (LPARAM)&hfont, 0)) + { + skip("TrueType font for charset %u is not installed\n", c[i].cs); + continue; + } + + old_hfont = SelectObject(hdc, hfont); + + ret = GetGlyphOutlineA(hdc, 0x8041, GGO_BITMAP, &gm, 0, NULL, &mat); + ret2 = GetGlyphOutlineA(hdc, 0x41, GGO_BITMAP, &gm2, 0, NULL, &mat); + todo_wine + ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2); + + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_BITMAP, &gm, 0, NULL, &mat); + ret2 = GetGlyphOutlineW(hdc, c[i].w, GGO_BITMAP, &gm2, 0, NULL, &mat); + ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2); + + hfont = SelectObject(hdc, old_hfont); + DeleteObject(hfont); + } + DeleteDC(hdc); }

1 0

Kusanagi Kouichi : gdi32/tests: Consolidate identity matrices.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: edabccd5af659d012b5f2acea2faa6688c40fe96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edabccd5af659d012b5f2acea… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Feb 3 20:06:44 2011 +0900 gdi32/tests: Consolidate identity matrices. --- dlls/gdi32/tests/font.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 01411ff..f07a427 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -50,6 +50,7 @@ static HANDLE (WINAPI *pAddFontMemResourceEx)(PVOID, DWORD, PVOID, DWORD *); static BOOL (WINAPI *pRemoveFontMemResourceEx)(HANDLE); static HMODULE hgdi32 = 0; +static const MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; static void init(void) { @@ -410,7 +411,6 @@ static void test_outline_font(void) INT width_orig, height_orig, lfWidth; XFORM xform; GLYPHMETRICS gm; - MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; MAT2 mat2 = { {0x8000,0}, {0,0}, {0,0}, {0x8000,0} }; POINT pt; INT ret; @@ -2175,7 +2175,6 @@ static void test_negative_width(HDC hdc, const LOGFONTA *lf) GLYPHMETRICS gm1, gm2; LOGFONTA lf2 = *lf; WORD idx; - MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; if(!pGetGlyphIndicesA) return; @@ -3096,7 +3095,6 @@ todo_wine static void test_GetGlyphOutline(void) { - MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; HDC hdc; GLYPHMETRICS gm; LOGFONTA lf;

1 0

Jacek Caban : wininet: Moved creation of an object and allocating handles to common function.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: a073c66f0d36ed52d03dafce41aef7ea1694bc0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a073c66f0d36ed52d03dafce4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 2 22:51:13 2011 +0100 wininet: Moved creation of an object and allocating handles to common function. Fixes a few leaks. --- dlls/wininet/ftp.c | 76 ++++++++++++---------------------------------- dlls/wininet/http.c | 71 +++++++++++++------------------------------ dlls/wininet/internet.c | 69 +++++++++++++++++++++--------------------- dlls/wininet/internet.h | 2 +- 4 files changed, 78 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a073c66f0d36ed52d03da…

1 0

Jacek Caban : wininet: Added more InternetCloseHandle tests.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 572c4f703997a6058e1e17b5627eb57558dca5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=572c4f703997a6058e1e17b56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 2 22:50:59 2011 +0100 wininet: Added more InternetCloseHandle tests. --- dlls/wininet/tests/http.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4bced99..5ff3258 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3178,6 +3178,74 @@ static void test_async_HttpSendRequestEx(void) CloseHandle( info.wait ); } +static HINTERNET closetest_session, closetest_req, closetest_conn; +static BOOL closetest_closed; + +static void WINAPI closetest_callback(HINTERNET hInternet, DWORD_PTR dwContext, DWORD dwInternetStatus, + LPVOID lpvStatusInformation, DWORD dwStatusInformationLength) +{ + DWORD len, type; + BOOL res; + + trace("closetest_callback %p: %d\n", hInternet, dwInternetStatus); + + ok(hInternet == closetest_session || hInternet == closetest_conn || hInternet == closetest_req, + "Unexpected hInternet %p\n", hInternet); + if(!closetest_closed) + return; + + len = sizeof(type); + res = InternetQueryOptionA(closetest_req, INTERNET_OPTION_HANDLE_TYPE, &type, &len); + ok(!res && GetLastError() == ERROR_INVALID_HANDLE, + "InternetQueryOptionA(%p INTERNET_OPTION_HANDLE_TYPE) failed: %x %u, expected TRUE ERROR_INVALID_HANDLE\n", + closetest_req, res, GetLastError()); +} + +static void test_InternetCloseHandle(void) +{ + DWORD len, flags; + BOOL res; + + closetest_session = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, INTERNET_FLAG_ASYNC); + ok(closetest_session != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + pInternetSetStatusCallbackA(closetest_session, closetest_callback); + + closetest_conn = InternetConnectA(closetest_session, "source.winehq.org", INTERNET_INVALID_PORT_NUMBER, + NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); + ok(closetest_conn != NULL,"InternetConnect failed with error %u\n", GetLastError()); + + closetest_req = HttpOpenRequestA(closetest_conn, "GET", "winegecko.php", NULL, NULL, NULL, + INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); + + res = HttpSendRequestA(closetest_req, NULL, -1, NULL, 0); + ok(!res && (GetLastError() == ERROR_IO_PENDING), + "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); + + len = sizeof(flags); + res = InternetQueryOptionA(closetest_req, INTERNET_OPTION_REQUEST_FLAGS, &flags, &len); + ok(res, "InternetQueryOptionA(%p INTERNET_OPTION_URL) failed: %u\n", closetest_req, GetLastError()); + + res = InternetCloseHandle(closetest_session); + ok(res, "InternetCloseHandle failed: %u\n", GetLastError()); + closetest_closed = TRUE; + trace("Closed session handle\n"); + + res = InternetCloseHandle(closetest_conn); + ok(!res && GetLastError() == ERROR_INVALID_HANDLE, "InternetCloseConnection(conn) failed: %x %u\n", + res, GetLastError()); + + res = InternetCloseHandle(closetest_req); + ok(!res && GetLastError() == ERROR_INVALID_HANDLE, "InternetCloseConnection(req) failed: %x %u\n", + res, GetLastError()); + + len = sizeof(flags); + res = InternetQueryOptionA(closetest_req, INTERNET_OPTION_REQUEST_FLAGS, &flags, &len); + ok(!res && GetLastError() == ERROR_INVALID_HANDLE, + "InternetQueryOptionA(%p INTERNET_OPTION_URL) failed: %x %u, expected TRUE ERROR_INVALID_HANDLE\n", + closetest_req, res, GetLastError()); +} + #define STATUS_STRING(status) \ memcpy(status_string[status], #status, sizeof(CHAR) * \ (strlen(#status) < MAX_STATUS_NAME ? \ @@ -3232,6 +3300,7 @@ START_TEST(http) pInternetSetStatusCallbackA = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackA"); init_status_tests(); + test_InternetCloseHandle(); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]); InternetReadFile_test(0, &test_data[0]); first_connection_to_test_url = TRUE;

1 0

Jacek Caban : wininet: Keep handles invalid but reserved in InternetCloseHandle.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 968ab5fd284b69bcc826d7cd20070112bb32e35d URL: http://source.winehq.org/git/wine.git/?a=commit;h=968ab5fd284b69bcc826d7cd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 2 22:50:46 2011 +0100 wininet: Keep handles invalid but reserved in InternetCloseHandle. --- dlls/wininet/internet.c | 80 ++++++++++++++++++++-------------------------- dlls/wininet/internet.h | 1 + 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index bdaa992..b546867 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -161,6 +161,7 @@ DWORD alloc_handle( object_header_t *info, HINTERNET *ret ) LeaveCriticalSection( &WININET_cs ); info->hInternet = *ret = (HINTERNET)handle; + info->valid_handle = res == ERROR_SUCCESS; return res; } @@ -178,7 +179,7 @@ object_header_t *get_handle_object( HINTERNET hinternet ) EnterCriticalSection( &WININET_cs ); - if(handle > 0 && handle < handle_table_size && handle_table[handle]) + if(handle > 0 && handle < handle_table_size && handle_table[handle] && handle_table[handle]->valid_handle) info = WININET_AddRef(handle_table[handle]); LeaveCriticalSection( &WININET_cs ); @@ -188,12 +189,31 @@ object_header_t *get_handle_object( HINTERNET hinternet ) return info; } +static void invalidate_handle(object_header_t *info) +{ + object_header_t *child, *next; + + if(!info->valid_handle) + return; + info->valid_handle = FALSE; + + /* Free all children as native does */ + LIST_FOR_EACH_ENTRY_SAFE( child, next, &info->children, object_header_t, entry ) + { + TRACE("invalidating child handle %p for parent %p\n", child->hInternet, info); + invalidate_handle( child ); + } + + WININET_Release(info); +} + BOOL WININET_Release( object_header_t *info ) { ULONG refs = InterlockedDecrement(&info->refs); TRACE( "object %p refcount = %d\n", info, refs ); if( !refs ) { + invalidate_handle(info); if ( info->vtbl->CloseConnection ) { TRACE( "closing connection %p\n", info); @@ -211,49 +231,20 @@ BOOL WININET_Release( object_header_t *info ) if ( info->htype != WH_HINIT ) list_remove( &info->entry ); info->vtbl->Destroy( info ); - } - return TRUE; -} -static void invalidate_handle( HINTERNET hinternet ) -{ - UINT_PTR handle = (UINT_PTR) hinternet; - object_header_t *info = NULL, *child, *next; + if(info->hInternet) { + UINT_PTR handle = (UINT_PTR)info->hInternet; - EnterCriticalSection( &WININET_cs ); + EnterCriticalSection( &WININET_cs ); - if(handle && handle < handle_table_size) - { - if(handle_table[handle]) { - info = handle_table[handle]; - TRACE( "destroying handle %ld for object %p\n", handle+1, info); handle_table[handle] = NULL; - } - } + if(next_handle > handle) + next_handle = handle; - LeaveCriticalSection( &WININET_cs ); - - /* As on native when the equivalent of WININET_Release is called, the handle - * is already invalid, but if a new handle is created at this time it does - * not yet get assigned the freed handle number */ - if( info ) - { - /* Free all children as native does */ - LIST_FOR_EACH_ENTRY_SAFE( child, next, &info->children, object_header_t, entry ) - { - TRACE( "freeing child handle %ld for parent handle %ld\n", - (UINT_PTR)child->hInternet, handle+1); - invalidate_handle( child->hInternet ); + LeaveCriticalSection( &WININET_cs ); } - WININET_Release( info ); } - - EnterCriticalSection( &WININET_cs ); - - if(next_handle > handle && !handle_table[handle]) - next_handle = handle; - - LeaveCriticalSection( &WININET_cs ); + return TRUE; } /*********************************************************************** @@ -1277,19 +1268,18 @@ BOOL WINAPI InternetFindNextFileW(HINTERNET hFind, LPVOID lpvFindData) */ BOOL WINAPI InternetCloseHandle(HINTERNET hInternet) { - object_header_t *lpwh; + object_header_t *obj; - TRACE("%p\n",hInternet); + TRACE("%p\n", hInternet); - lpwh = get_handle_object( hInternet ); - if (NULL == lpwh) - { - INTERNET_SetLastError(ERROR_INVALID_HANDLE); + obj = get_handle_object( hInternet ); + if (!obj) { + SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - WININET_Release( lpwh ); - invalidate_handle( hInternet ); + invalidate_handle(obj); + WININET_Release(obj); return TRUE; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 8239db2..d6cd1d2 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -204,6 +204,7 @@ struct _object_header_t WH_TYPE htype; const object_vtbl_t *vtbl; HINTERNET hInternet; + BOOL valid_handle; DWORD dwFlags; DWORD_PTR dwContext; DWORD dwError;

1 0

Jacek Caban : wininet: Handles handling clean up.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: f165e25e591579c028380152f3f8110f520dc645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f165e25e591579c028380152f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 2 22:50:31 2011 +0100 wininet: Handles handling clean up. --- dlls/wininet/dialogs.c | 6 +- dlls/wininet/ftp.c | 43 ++++++++------ dlls/wininet/http.c | 26 ++++----- dlls/wininet/internet.c | 143 +++++++++++++++++++++++------------------------ dlls/wininet/internet.h | 30 +++++++++- 5 files changed, 135 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f165e25e591579c028380…

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DPalette typedefs.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: e1815f5e3bdcf7be600260505e59a5123c66bb93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1815f5e3bdcf7be600260505… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 2 20:22:53 2011 +0100 wined3d: Get rid of the IWineD3DPalette typedefs. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/palette.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/surface_base.c | 25 +++++++++++++++---------- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/wined3d_private.h | 12 ++++++------ 6 files changed, 30 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a1aa62..61a9e94 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1609,14 +1609,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface } static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DWORD flags, - const PALETTEENTRY *PalEnt, void *parent, IWineD3DPalette **Palette) + const PALETTEENTRY *entries, void *parent, struct wined3d_palette **palette) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - IWineD3DPaletteImpl *object; + struct wined3d_palette *object; HRESULT hr; TRACE("iface %p, flags %#x, entries %p, palette %p, parent %p.\n", - iface, flags, PalEnt, Palette, parent); + iface, flags, entries, palette, parent); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -1625,7 +1625,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DW return E_OUTOFMEMORY; } - hr = wined3d_palette_init(object, This, flags, PalEnt, parent); + hr = wined3d_palette_init(object, This, flags, entries, parent); if (FAILED(hr)) { WARN("Failed to initialize palette, hr %#x.\n", hr); @@ -1634,7 +1634,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreatePalette(IWineD3DDevice *iface, DW } TRACE("Created palette %p.\n", object); - *Palette = (IWineD3DPalette *)object; + *palette = object; return WINED3D_OK; } diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 5e9f863..d14587a 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -158,7 +158,7 @@ void * CDECL wined3d_palette_get_parent(const struct wined3d_palette *palette) return palette->parent; } -HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *device, +HRESULT wined3d_palette_init(struct wined3d_palette *palette, IWineD3DDeviceImpl *device, DWORD flags, const PALETTEENTRY *entries, void *parent) { HRESULT hr; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20930c4..4377f10 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -335,7 +335,7 @@ void draw_textured_quad(IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, static void surface_realize_palette(IWineD3DSurfaceImpl *surface) { - IWineD3DPaletteImpl *palette = surface->palette; + struct wined3d_palette *palette = surface->palette; TRACE("surface %p.\n", surface); @@ -2371,7 +2371,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey) { IWineD3DDeviceImpl *device = This->resource.device; - IWineD3DPaletteImpl *pal = This->palette; + struct wined3d_palette *pal = This->palette; BOOL index_in_alpha = FALSE; unsigned int i; diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index ae7e441..06ea80a 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -216,12 +216,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_Restore(IWineD3DSurface *iface) { return WINED3D_OK; } -HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD3DPalette *Pal) { +HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, struct wined3d_palette *palette) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - IWineD3DPaletteImpl *PalImpl = (IWineD3DPaletteImpl *) Pal; - TRACE("(%p)->(%p)\n", This, Pal); - if(This->palette == PalImpl) { + TRACE("iface %p, palette %p.\n", iface, palette); + + if (This->palette == palette) + { TRACE("Nop palette change\n"); return WINED3D_OK; } @@ -230,12 +232,12 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD if (This->resource.usage & WINED3DUSAGE_RENDERTARGET) This->palette->flags &= ~WINEDDPCAPS_PRIMARYSURFACE; - This->palette = PalImpl; + This->palette = palette; - if (PalImpl) + if (palette) { if (This->resource.usage & WINED3DUSAGE_RENDERTARGET) - PalImpl->flags |= WINEDDPCAPS_PRIMARYSURFACE; + palette->flags |= WINEDDPCAPS_PRIMARYSURFACE; This->surface_ops->surface_realize_palette(This); } @@ -306,11 +308,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD return WINED3D_OK; } -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPalette(IWineD3DSurface *iface, IWineD3DPalette **Pal) { +HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPalette(IWineD3DSurface *iface, struct wined3d_palette **palette) +{ IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - TRACE("(%p)->(%p)\n", This, Pal); - *Pal = (IWineD3DPalette *) This->palette; + TRACE("iface %p, palette %p.\n", iface, palette); + + *palette = This->palette; + return WINED3D_OK; } diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 9a729fb..e523ea1 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -59,7 +59,7 @@ void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) static void gdi_surface_realize_palette(IWineD3DSurfaceImpl *surface) { - IWineD3DPaletteImpl *palette = surface->palette; + struct wined3d_palette *palette = surface->palette; TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c1c3f0..2fe8e59 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -58,8 +58,6 @@ typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; struct IWineD3DBaseShaderImpl; struct IWineD3DBaseTextureImpl; struct IWineD3DResourceImpl; -typedef struct wined3d_palette IWineD3DPaletteImpl; -typedef struct wined3d_palette IWineD3DPalette; /* Texture format fixups */ @@ -2099,7 +2097,7 @@ struct IWineD3DSurfaceImpl const struct wined3d_surface_ops *surface_ops; struct wined3d_subresource_container container; WINED3DSURFACET_DESC currentDesc; - IWineD3DPaletteImpl *palette; /* D3D7 style palette handling */ + struct wined3d_palette *palette; /* D3D7 style palette handling */ PALETTEENTRY *palette9; /* D3D8/9 style palette handling */ DWORD flags; @@ -2199,8 +2197,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWOR HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_Restore(IWineD3DSurface *iface) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPalette(IWineD3DSurface *iface, IWineD3DPalette **Pal) DECLSPEC_HIDDEN; -HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD3DPalette *Pal) DECLSPEC_HIDDEN; +HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPalette(IWineD3DSurface *iface, + struct wined3d_palette **Pal) DECLSPEC_HIDDEN; +HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, + struct wined3d_palette *Pal) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD flags, const WINEDDCOLORKEY *CKey) DECLSPEC_HIDDEN; DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPitch(IWineD3DSurface *iface) DECLSPEC_HIDDEN; @@ -2957,7 +2957,7 @@ struct wined3d_palette DWORD flags; }; -HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *device, +HRESULT wined3d_palette_init(struct wined3d_palette *palette, IWineD3DDeviceImpl *device, DWORD flags, const PALETTEENTRY *entries, void *parent) DECLSPEC_HIDDEN; /* DirectDraw utility functions */

1 0

Henri Verbeet : wined3d: Remove COM from the palette.
by Alexandre Julliard 03 Feb '11

03 Feb '11

Module: wine Branch: master Commit: 5963483fc23c359e3ad9811ed1010bc80e68ea1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5963483fc23c359e3ad9811ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 2 20:22:52 2011 +0100 wined3d: Remove COM from the palette. --- dlls/ddraw/ddraw_private.h | 3 +- dlls/ddraw/palette.c | 12 ++-- dlls/ddraw/surface.c | 18 +++-- dlls/wined3d/palette.c | 157 ++++++++++++++-------------------------- dlls/wined3d/wined3d.spec | 7 ++ dlls/wined3d/wined3d_private.h | 15 ++--- include/wine/wined3d.idl | 40 ++++------- 7 files changed, 98 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5963483fc23c359e3ad98…

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
68
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 February 2011