October 2012 - Wine-Commits

Piotr Caban : wininet: Fixed failing test.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 8e6d2bab3766e48cf559a011d6aa9b6419851ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6d2bab3766e48cf559a011d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 3 12:29:15 2012 +0200 wininet: Fixed failing test. --- dlls/wininet/tests/urlcache.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index c8f4570..f4e50ce 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -41,6 +41,7 @@ static BOOL (WINAPI *pUnlockUrlCacheEntryFileA)(LPCSTR,DWORD); static char filenameA[MAX_PATH + 1]; static char filenameA1[MAX_PATH + 1]; +static BOOL old_ie = FALSE; static void check_cache_entry_infoA(const char *returnedfrom, LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo) { @@ -137,7 +138,7 @@ static void test_GetUrlCacheEntryInfoExA(void) /* Unicode version of function seems to ignore 0x200 flag */ ret = GetUrlCacheEntryInfoExW(test_urlW, NULL, NULL, NULL, NULL, NULL, 0x200 /*GET_INSTALLED_ENTRY*/); - ok(ret, "GetUrlCacheEntryInfoExW failed with error %d\n", GetLastError()); + ok(ret || broken(old_ie && !ret), "GetUrlCacheEntryInfoExW failed with error %d\n", GetLastError()); ret = GetUrlCacheEntryInfoEx(test_url, lpCacheEntryInfo, &cbCacheEntryInfo, NULL, NULL, NULL, 0); ok(ret, "GetUrlCacheEntryInfoEx failed with error %d\n", GetLastError()); @@ -845,10 +846,10 @@ static void test_GetDiskInfoA(void) ret = GetDiskInfoA(path, NULL, NULL, NULL); error = GetLastError(); ok(!ret || - broken(ret), /* < IE7 */ + broken(old_ie && ret), /* < IE7 */ "GetDiskInfoA succeeded\n"); ok(error == ERROR_PATH_NOT_FOUND || - broken(error == 0xdeadbeef), /* < IE7 */ + broken(old_ie && error == 0xdeadbeef), /* < IE7 */ "got %u expected ERROR_PATH_NOT_FOUND\n", error); SetLastError(0xdeadbeef); @@ -867,6 +868,8 @@ START_TEST(urlcache) win_skip("Too old IE (older than 6.0)\n"); return; } + if(!GetProcAddress(hdll, "InternetGetSecurityInfoByURL")) /* < IE7 */ + old_ie = TRUE; pDeleteUrlCacheEntryA = (void*)GetProcAddress(hdll, "DeleteUrlCacheEntryA"); pUnlockUrlCacheEntryFileA = (void*)GetProcAddress(hdll, "UnlockUrlCacheEntryFileA");

1 0

Erich Hoover : hhctrl.ocx: Store all the parameters the first time the WinType is filled in.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: bc2258d678d43062441bbc62f98ad3d7370ab4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2258d678d43062441bbc62f… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Oct 2 15:13:14 2012 -0600 hhctrl.ocx: Store all the parameters the first time the WinType is filled in. --- dlls/hhctrl.ocx/chm.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 88bd6e5..e3f2a44 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -263,6 +263,13 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) if (unhandled_params) FIXME("Unsupported fsValidMembers fields: 0x%x\n", unhandled_params); + dst->fsValidMembers |= merge; + if (dst->cbStruct == 0) + { + /* If the structure has not been filled in yet then use all of the values */ + dst->cbStruct = sizeof(HH_WINTYPEW); + merge = ~0; + } if (merge & HHWIN_PARAM_PROPERTIES) dst->fsWinProperties = src->fsWinProperties; if (merge & HHWIN_PARAM_STYLES) dst->dwStyles = src->dwStyles; if (merge & HHWIN_PARAM_EXSTYLES) dst->dwExStyles = src->dwExStyles; @@ -276,7 +283,6 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) if (merge & HHWIN_PARAM_TABORDER) memcpy(&dst->tabOrder, &src->tabOrder, sizeof(src->tabOrder)); if (merge & HHWIN_PARAM_HISTORY_COUNT) dst->cHistory = src->cHistory; if (merge & HHWIN_PARAM_CUR_TAB) dst->curNavType = src->curNavType; - dst->fsValidMembers |= merge; /* * Note: We assume that hwndHelp, hwndCaller, hwndToolBar, hwndNavigation, and hwndHTML cannot be

1 0

Nozomi Kodama : d3dx9_36/tests: Relax an equality between floats.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 3d5c61cdcd0431f381b412a3bf8963f9bde88a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5c61cdcd0431f381b412a3b… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:13:11 2012 +0800 d3dx9_36/tests: Relax an equality between floats. --- dlls/d3dx9_36/tests/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 761b832..8ab0391 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2418,7 +2418,7 @@ static void test_D3DXSHAdd(void) ok(relative_error(in1[i] + in2[i], out[i]) < admitted_error, "%u-%u: D3DXSHAdd() failed, got %f, expected %f\n", k, i, out[i], in1[i] + in2[i]); } - ok(out[count] == 0.0f, "%u-%u: D3DXSHAdd() failed, got %f, expected 0.0\n", k, k * k, out[count]); + ok(relative_error(out[count], 0.0f) < admitted_error, "%u-%u: D3DXSHAdd() failed, got %f, expected 0.0\n", k, k * k, out[count]); } }

1 0

Christian Costa : ntoskrnl.exe: Add stub for ExCreateCallback.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: ea943293c6185842b1350cc55c39df543fc64cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea943293c6185842b1350cc55… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 3 08:55:06 2012 +0200 ntoskrnl.exe: Add stub for ExCreateCallback. --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 632cea5..06993ee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1105,6 +1105,18 @@ PVOID WINAPI ExAllocatePoolWithQuotaTag( POOL_TYPE type, SIZE_T size, ULONG tag /*********************************************************************** + * ExCreateCallback (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, + BOOLEAN create, BOOLEAN allow_multiple) +{ + FIXME("(%p, %p, %u, %u): stub\n", obj, attr, create, allow_multiple); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ void WINAPI ExFreePool( void *ptr ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b169815..4bce7ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -122,7 +122,7 @@ @ stdcall ExAllocatePoolWithTag(long long long) @ stub ExAllocatePoolWithTagPriority @ stub ExConvertExclusiveToSharedLite -@ stub ExCreateCallback +@ stdcall ExCreateCallback(ptr ptr long long) @ stub ExDeleteNPagedLookasideList @ stub ExDeletePagedLookasideList @ stub ExDeleteResourceLite diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 183c950..bf9c15e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1106,6 +1106,15 @@ typedef enum { IoModifyAccess } LOCK_OPERATION; +typedef struct _CALLBACK_OBJECT +{ + ULONG Signature; + KSPIN_LOCK Lock; + LIST_ENTRY RegisteredCallbacks; + BOOLEAN AllowMultipleCallbacks; + UCHAR reserved[3]; +} CALLBACK_OBJECT, *PCALLBACK_OBJECT; + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #ifdef NONAMELESSUNION

1 0

Bruno Jesus : ws2_32: Fix some style issues.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: af8dc8090a13eb85d0cf1068b43639414455450a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8dc8090a13eb85d0cf1068b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 2 21:17:43 2012 -0300 ws2_32: Fix some style issues. --- dlls/ws2_32/socket.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8efa1e6..f978350 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2511,7 +2511,7 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) int fd; int res; - TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen?*namelen:0); + TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen ? *namelen : 0); fd = get_sock_fd( s, 0, NULL ); res = SOCKET_ERROR; @@ -2546,7 +2546,7 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) int fd; int res; - TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen?*namelen:0); + TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen ? *namelen : 0); /* Check if what we've received is valid. Should we use IsBadReadPtr? */ if( (name == NULL) || (namelen == NULL) ) @@ -4194,7 +4194,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, SetLastError(WSAEFAULT); return SOCKET_ERROR; } - linger.l_onoff = *((const int*)optval) ? 0: 1; + linger.l_onoff = *(const int*)optval == 0; linger.l_linger = 0; level = SOL_SOCKET; optname = SO_LINGER; @@ -6077,7 +6077,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, { case CF_ACCEPT: if (addr && addrlen) - memcpy(addr, &src_addr, (*addrlen > size) ? size : *addrlen ); + memcpy(addr, &src_addr, (*addrlen > size) ? size : *addrlen ); return cs; case CF_DEFER: SERVER_START_REQ( set_socket_deferred )

1 0

André Hentschel : winedbg: Add control operators to Thumb2 disassembler.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 4deaee99276a28b7596d40196e22ba80e1b3688a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4deaee99276a28b7596d40196… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 00:23:21 2012 +0200 winedbg: Add control operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 37b3a5b..2a52b1d 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -712,6 +712,31 @@ static UINT thumb2_disasm_hint(UINT inst, ADDRESS64 *addr) return inst; } +static UINT thumb2_disasm_miscctrl(UINT inst, ADDRESS64 *addr) +{ + WORD op = (inst >> 4) & 0x0f; + + switch (op) + { + case 2: + dbg_printf("\n\tclrex"); + break; + case 4: + dbg_printf("\n\tdsb\t#%u", get_nibble(inst, 0)); + break; + case 5: + dbg_printf("\n\tdmb\t#%u", get_nibble(inst, 0)); + break; + case 6: + dbg_printf("\n\tisb\t#%u", get_nibble(inst, 0)); + break; + default: + return inst; + } + + return 0; +} + static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) { WORD op1 = (inst >> 20) & 0x03; @@ -1018,6 +1043,7 @@ static const struct inst_arm tbl_thumb32[] = { { 0xfff0f000, 0xf3e08000, thumb2_disasm_srtrans }, { 0xfff0f000, 0xf3808000, thumb2_disasm_srtrans }, { 0xfff0d000, 0xf3a08000, thumb2_disasm_hint }, + { 0xfff0d000, 0xf3b08000, thumb2_disasm_miscctrl }, { 0xf8008000, 0xf0008000, thumb2_disasm_branch }, { 0xffc0f0c0, 0xfa80f080, thumb2_disasm_misc }, { 0xff80f000, 0xfa00f000, thumb2_disasm_dataprocessingreg },

1 0

André Hentschel : winedbg: Improve and add branch operators for Thumb2 disassembler.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 1e1e181b2e31cde75057e5898d9eeabc1f46bc5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e1e181b2e31cde75057e5898… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 00:20:40 2012 +0200 winedbg: Improve and add branch operators for Thumb2 disassembler. --- programs/winedbg/be_arm.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 6da8c9f..c7acfee 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -634,11 +634,29 @@ static WORD thumb_disasm_movshift(WORD inst, ADDRESS64 *addr) return 0; } -static UINT thumb2_disasm_branchlinked(UINT inst, ADDRESS64 *addr) +static UINT thumb2_disasm_branch(UINT inst, ADDRESS64 *addr) { - UINT offset = (((inst & 0x07ff0000) >> 4) | ((inst & 0x000007ff) << 1)) + 4; + UINT S = (inst >> 26) & 0x01; + UINT L = (inst >> 14) & 0x01; + UINT I1 = !(((inst >> 13) & 0x01) ^ S); + UINT C = !((inst >> 12) & 0x01); + UINT I2 = !(((inst >> 11) & 0x01) ^ S); + UINT offset = (inst & 0x000007ff) << 1; - dbg_printf("\n\tbl\t"); + if (C) + { + offset |= I1 << 19 | I2 << 18 | (inst & 0x003f0000) >> 4; + offset += 4; + if (S) offset |= 0x0fff << 20; + } + else + { + offset |= I1 << 23 | I2 << 22 | (inst & 0x03ff0000) >> 4; + offset += 4; + if (S) offset |= 0xff << 24; + } + + dbg_printf("\n\tb%s%s\t", L ? "l" : "", C ? tbl_cond[(inst >> 22) & 0x0f] : ""); db_printsym(addr->Offset + offset); return 0; } @@ -946,7 +964,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { }; static const struct inst_arm tbl_thumb32[] = { - { 0xf800f800, 0xf000f800, thumb2_disasm_branchlinked }, + { 0xf800f000, 0xf0008000, thumb2_disasm_branch }, { 0xffc0f0c0, 0xfa80f080, thumb2_disasm_misc }, { 0xff80f000, 0xfa00f000, thumb2_disasm_dataprocessingreg }, { 0xff8000c0, 0xfb000000, thumb2_disasm_mul },

1 0

Henri Verbeet : wined3d: wined3d_swapchain_set_window() never fails.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: e55416a113b44d21fab5d41d0018f31d9a3b2bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55416a113b44d21fab5d41d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 2 22:15:39 2012 +0200 wined3d: wined3d_swapchain_set_window() never fails. --- dlls/wined3d/swapchain.c | 6 ++---- include/wine/wined3d.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6be89af..8117df8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -130,18 +130,16 @@ void * CDECL wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapch return swapchain->parent; } -HRESULT CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window) +void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window) { if (!window) window = swapchain->device_window; if (window == swapchain->win_handle) - return WINED3D_OK; + return; TRACE("Setting swapchain %p window from %p to %p.\n", swapchain, swapchain->win_handle, window); swapchain->win_handle = window; - - return WINED3D_OK; } HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8db9357..c8d95ba 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2379,7 +2379,7 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RGNDATA *dirty_region, DWORD flags); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, DWORD flags, const struct wined3d_gamma_ramp *ramp); -HRESULT __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); +void __cdecl wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWND window); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region);

1 0

Henri Verbeet : wined3d: Just return the surface from wined3d_device_get_surface_from_dc().
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 50c61959ebb7c4604430e39ef828f5f2ef1137d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c61959ebb7c4604430e39ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 2 22:15:38 2012 +0200 wined3d: Just return the surface from wined3d_device_get_surface_from_dc(). --- dlls/ddraw/ddraw.c | 4 +--- dlls/wined3d/device.c | 12 +++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 +-- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1530685..e83091e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2422,14 +2422,12 @@ static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, struct ddraw *ddraw = impl_from_IDirectDraw7(iface); struct wined3d_surface *wined3d_surface; struct ddraw_surface *surface_impl; - HRESULT hr; TRACE("iface %p, dc %p, surface %p.\n", iface, hdc, Surface); if (!Surface) return E_INVALIDARG; - hr = wined3d_device_get_surface_from_dc(ddraw->wined3d_device, hdc, &wined3d_surface); - if (FAILED(hr)) + if (!(wined3d_surface = wined3d_device_get_surface_from_dc(ddraw->wined3d_device, hdc))) { TRACE("No surface found for dc %p.\n", hdc); *Surface = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c03537d..8a7d6d5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5417,15 +5417,14 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("Resource released.\n"); } -HRESULT CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *device, - HDC dc, struct wined3d_surface **surface) +struct wined3d_surface * CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *device, HDC dc) { struct wined3d_resource *resource; - TRACE("device %p, dc %p, surface %p.\n", device, dc, surface); + TRACE("device %p, dc %p.\n", device, dc); if (!dc) - return WINED3DERR_INVALIDCALL; + return NULL; LIST_FOR_EACH_ENTRY(resource, &device->resources, struct wined3d_resource, resource_list_entry) { @@ -5436,13 +5435,12 @@ HRESULT CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *de if (s->hDC == dc) { TRACE("Found surface %p for dc %p.\n", s, dc); - *surface = s; - return WINED3D_OK; + return s; } } } - return WINED3DERR_INVALIDCALL; + return NULL; } HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a885746..865bf90 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -82,7 +82,7 @@ @ cdecl wined3d_device_get_software_vertex_processing(ptr) @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) @ cdecl wined3d_device_get_stream_source_freq(ptr long ptr) -@ cdecl wined3d_device_get_surface_from_dc(ptr ptr ptr) +@ cdecl wined3d_device_get_surface_from_dc(ptr ptr) @ cdecl wined3d_device_get_swapchain(ptr long) @ cdecl wined3d_device_get_swapchain_count(ptr) @ cdecl wined3d_device_get_texture(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a5465fb..8db9357 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2152,8 +2152,7 @@ HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *de UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride); HRESULT __cdecl wined3d_device_get_stream_source_freq(const struct wined3d_device *device, UINT stream_idx, UINT *divider); -HRESULT __cdecl wined3d_device_get_surface_from_dc(const struct wined3d_device *device, - HDC dc, struct wined3d_surface **surface); +struct wined3d_surface * __cdecl wined3d_device_get_surface_from_dc(const struct wined3d_device *device, HDC dc); struct wined3d_swapchain * __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device, UINT swapchain_idx); UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device);

1 0

Nozomi Kodama : d3dx9_36/tests: Avoid a potential out of bound access.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 9c823d04b6cd159b1d7251c7c654245f1177ddf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c823d04b6cd159b1d7251c7c… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:12:27 2012 +0800 d3dx9_36/tests: Avoid a potential out of bound access. --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index d56e38d..761b832 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2818,10 +2818,10 @@ static void test_D3DXSHRotateZ(void) { /* order = 0 or order = 1 behaves like order = D3DXSH_MINORDER */ square = ( order <= D3DXSH_MINORDER ) ? D3DXSH_MINORDER * D3DXSH_MINORDER : order * order; - expected = table[36 * j + i]; if ( i >= square || ( (order >= D3DXSH_MAXORDER) && ( i >= D3DXSH_MAXORDER * D3DXSH_MAXORDER ) ) ) expected = ( i + 1.0f ) * ( i + 1.0f ); - + else + expected = table[36 * j + i]; ok(relative_error(out[i], expected) < admitted_error, "angle %f, order %u index %u, Expected %f, received %f\n", angle[j], order, i, expected, out[i]); } }

1 0