wine-commits December 2007

wine-commits@winehq.org

3 participants
824 discussions

Dmitry Timoshkov : ntdll: Initialize the APC call union to suppress valgrind warnings. Take 2.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: f2f3de20ac5631bfe0f11141773e78ad2d97cb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f3de20ac5631bfe0f111417… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Dec 11 22:07:42 2007 +0800 ntdll: Initialize the APC call union to suppress valgrind warnings. Take 2. --- dlls/ntdll/thread.c | 2 ++ dlls/ntdll/virtual.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 15768c2..a934392 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -508,6 +508,8 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * apc_call_t call; apc_result_t result; + memset( &call, 0, sizeof(call) ); + call.create_thread.type = APC_CREATE_THREAD; call.create_thread.func = start; call.create_thread.arg = param; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 684fa5d..b5e236f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1363,6 +1363,8 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ apc_call_t call; apc_result_t result; + memset( &call, 0, sizeof(call) ); + call.virtual_alloc.type = APC_VIRTUAL_ALLOC; call.virtual_alloc.addr = *ret; call.virtual_alloc.size = *size_ptr; @@ -1484,6 +1486,8 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si apc_call_t call; apc_result_t result; + memset( &call, 0, sizeof(call) ); + call.virtual_free.type = APC_VIRTUAL_FREE; call.virtual_free.addr = addr; call.virtual_free.size = size; @@ -1580,6 +1584,8 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T apc_call_t call; apc_result_t result; + memset( &call, 0, sizeof(call) ); + call.virtual_protect.type = APC_VIRTUAL_PROTECT; call.virtual_protect.addr = addr; call.virtual_protect.size = size; @@ -1681,6 +1687,8 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, apc_call_t call; apc_result_t result; + memset( &call, 0, sizeof(call) ); + call.virtual_query.type = APC_VIRTUAL_QUERY; call.virtual_query.addr = addr; status = NTDLL_queue_process_apc( process, &call, &result ); @@ -1787,6 +1795,8 @@ NTSTATUS WINAPI NtLockVirtualMemory( HANDLE process, PVOID *addr, SIZE_T *size, apc_call_t call; apc_result_t result; + memset( &call, 0, sizeof(call) ); + call.virtual_lock.type = APC_VIRTUAL_LOCK; call.virtual_lock.addr = *addr; call.virtual_lock.size = *size; @@ -1822,6 +1832,8 @@ NTSTATUS WINAPI NtUnlockVirtualMemory( HANDLE process, PVOID *addr, SIZE_T *size apc_call_t call; apc_result_t result; + memset( &call, 0, sizeof(call) ); + call.virtual_unlock.type = APC_VIRTUAL_UNLOCK; call.virtual_unlock.addr = *addr; call.virtual_unlock.size = *size; @@ -1963,6 +1975,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p apc_call_t call; apc_result_t result; + memset( &call, 0, sizeof(call) ); + call.map_view.type = APC_MAP_VIEW; call.map_view.handle = handle; call.map_view.addr = *addr_ptr; @@ -2122,6 +2136,8 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) apc_call_t call; apc_result_t result; + memset( &call, 0, sizeof(call) ); + call.unmap_view.type = APC_UNMAP_VIEW; call.unmap_view.addr = addr; status = NTDLL_queue_process_apc( process, &call, &result ); @@ -2157,6 +2173,8 @@ NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr, apc_call_t call; apc_result_t result; + memset( &call, 0, sizeof(call) ); + call.virtual_flush.type = APC_VIRTUAL_FLUSH; call.virtual_flush.addr = addr; call.virtual_flush.size = *size_ptr;

1 0

Aric Stewart : wintrust: Implementations for WTHelperGetFileName and WTHelperGetFileHandle.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: 8d5f94b19924639e306d30defceb068a63c7e6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d5f94b19924639e306d30def… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 11 22:16:03 2007 +0900 wintrust: Implementations for WTHelperGetFileName and WTHelperGetFileHandle. --- dlls/wintrust/wintrust.spec | 4 ++-- dlls/wintrust/wintrust_main.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 5629c3d..552cfdd 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -77,8 +77,8 @@ @ stub WTHelperCertIsSelfSigned @ stub WTHelperCheckCertUsage @ stub WTHelperGetAgencyInfo -@ stub WTHelperGetFileHandle -@ stub WTHelperGetFileName +@ stdcall WTHelperGetFileHandle(ptr) +@ stdcall WTHelperGetFileName(ptr) @ stub WTHelperGetKnownUsages @ stdcall WTHelperGetProvCertFromChain(ptr long) @ stub WTHelperGetProvPrivateDataFromChain diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index cb6724f..b7788b1 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -432,6 +432,30 @@ CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData) return (CRYPT_PROVIDER_DATA *)hStateData; } +/*********************************************************************** + * WTHelperGetFileName(WINTRUST.@) + */ +LPCWSTR WINAPI WTHelperGetFileName(WINTRUST_DATA *data) +{ + TRACE("%p\n",data); + if (data->dwUnionChoice == WTD_CHOICE_FILE) + return data->u.pFile->pcwszFilePath; + else + return NULL; +} + +/*********************************************************************** + * WTHelperGetFileHandle(WINTRUST.@) + */ +HANDLE WINAPI WTHelperGetFileHandle(WINTRUST_DATA *data) +{ + TRACE("%p\n",data); + if (data->dwUnionChoice == WTD_CHOICE_FILE) + return data->u.pFile->hFile; + else + return INVALID_HANDLE_VALUE; +} + static const WCHAR Software_Publishing[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\',

1 0

Thomas Weidenmueller : comctl32: Fix painting bug in listview control.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: 23dd46413c6e75eae10c57cf82eef7075dc79635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23dd46413c6e75eae10c57cf8… Author: Thomas Weidenmueller <thomas(a)reactsoft.com> Date: Mon Dec 10 23:43:43 2007 -0700 comctl32: Fix painting bug in listview control. --- dlls/comctl32/listview.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 5e4d4c0..8405d41 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -944,7 +944,7 @@ static inline DWORD notify_customdraw (const LISTVIEW_INFO *infoPtr, DWORD dwDra return result; } -static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd) +static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd, BOOL SubItem) { if (lpnmlvcd->clrTextBk == CLR_DEFAULT) lpnmlvcd->clrTextBk = comctl32_color.clrWindow; @@ -952,18 +952,21 @@ static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRA lpnmlvcd->clrText = comctl32_color.clrWindowText; /* apprently, for selected items, we have to override the returned values */ - if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) + if (!SubItem) { - if (infoPtr->bFocus) - { - lpnmlvcd->clrTextBk = comctl32_color.clrHighlight; - lpnmlvcd->clrText = comctl32_color.clrHighlightText; + if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) + { + if (infoPtr->bFocus) + { + lpnmlvcd->clrTextBk = comctl32_color.clrHighlight; + lpnmlvcd->clrText = comctl32_color.clrHighlightText; + } + else if (infoPtr->dwStyle & LVS_SHOWSELALWAYS) + { + lpnmlvcd->clrTextBk = comctl32_color.clr3dFace; + lpnmlvcd->clrText = comctl32_color.clrBtnText; + } } - else if (infoPtr->dwStyle & LVS_SHOWSELALWAYS) - { - lpnmlvcd->clrTextBk = comctl32_color.clr3dFace; - lpnmlvcd->clrText = comctl32_color.clrBtnText; - } } /* Set the text attributes */ @@ -3787,7 +3790,9 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS if (cdsubitemmode & CDRF_SKIPDEFAULT) goto postpaint; } if (nSubItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) - prepaint_setup(infoPtr, hdc, &nmlvcd); + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); + else if ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) == FALSE) + prepaint_setup(infoPtr, hdc, &nmlvcd, TRUE); /* in full row select, subitems, will just use main item's colors */ if (nSubItem && uView == LVS_REPORT && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) @@ -3930,7 +3935,7 @@ static void LISTVIEW_RefreshOwnerDraw(const LISTVIEW_INFO *infoPtr, ITERATOR *i, if (!(cditemmode & CDRF_SKIPDEFAULT)) { - prepaint_setup (infoPtr, hdc, &nmlvcd); + prepaint_setup (infoPtr, hdc, &nmlvcd, FALSE); SendMessageW(infoPtr->hwndNotify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } @@ -4118,7 +4123,7 @@ static void LISTVIEW_Refresh(LISTVIEW_INFO *infoPtr, HDC hdc, const RECT *prcEra customdraw_fill(&nmlvcd, infoPtr, hdc, &rcClient, 0); cdmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd); if (cdmode & CDRF_SKIPDEFAULT) goto enddraw; - prepaint_setup(infoPtr, hdc, &nmlvcd); + prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); /* Use these colors to draw the items */ infoPtr->clrTextBk = nmlvcd.clrTextBk;

1 0

Gregor Brunmar : comctl32: Monthcal lost focus fix.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: d055cb8d5c665a1681ab944629456bd6ce342e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d055cb8d5c665a1681ab94462… Author: Gregor Brunmar <gregor.brunmar(a)home.se> Date: Mon Dec 10 19:21:36 2007 +0100 comctl32: Monthcal lost focus fix. --- dlls/comctl32/monthcal.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 8a92d42..0144df5 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1719,11 +1719,14 @@ MONTHCAL_Paint(MONTHCAL_INFO *infoPtr, WPARAM wParam) static LRESULT -MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr) +MONTHCAL_KillFocus(const MONTHCAL_INFO *infoPtr, HWND hFocusWnd) { TRACE("\n"); - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + if (infoPtr->hwndNotify != hFocusWnd) + ShowWindow(infoPtr->hwndSelf, SW_HIDE); + else + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0; } @@ -2031,7 +2034,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DLGC_WANTARROWS | DLGC_WANTCHARS; case WM_KILLFOCUS: - return MONTHCAL_KillFocus(infoPtr); + return MONTHCAL_KillFocus(infoPtr, (HWND)wParam); case WM_RBUTTONDOWN: return MONTHCAL_RButtonDown(infoPtr, lParam);

1 0

Michael Stefaniuc : wined3d: Fix a " ordered comparison of pointer with integer zero".
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: a526ad6cbc7a533c0ca4f066b75ca7b6492ef282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a526ad6cbc7a533c0ca4f066b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 10 23:55:18 2007 +0100 wined3d: Fix a "ordered comparison of pointer with integer zero". --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e70f025..5b3a2e5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -197,7 +197,7 @@ void primitiveDeclarationConvertToStridedData( WARN("loadBaseVertexIndex is < 0 (%d), not using vbos\n", This->stateBlock->loadBaseVertexIndex); streamVBO = 0; data = ((IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[element->Stream])->resource.allocatedMemory; - if(data + This->stateBlock->loadBaseVertexIndex * stride < 0) { + if((UINT_PTR)data < -This->stateBlock->loadBaseVertexIndex * stride) { FIXME("System memory vertex data load offset is negative!\n"); } }

1 0

Alexandre Julliard : winebuild: Don' t set the IMAGE_FILE_DLL flag on native modules.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: b462c20876feae7b1384a50a8acfa5b376562bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=b462c20876feae7b1384a50a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 11 12:52:26 2007 +0100 winebuild: Don't set the IMAGE_FILE_DLL flag on native modules. --- tools/winebuild/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 5005fe1..3238b2a 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -594,7 +594,8 @@ int main(int argc, char **argv) switch(exec_mode) { case MODE_DLL: - spec->characteristics |= IMAGE_FILE_DLL; + if (spec->subsystem != IMAGE_SUBSYSTEM_NATIVE) + spec->characteristics |= IMAGE_FILE_DLL; load_resources( argv, spec ); load_import_libs( argv ); if (!spec_file_name) fatal_error( "missing .spec file\n" );

1 0

Alexandre Julliard : Makedll.rules: Add a generic EXTRADLLFLAGS variable instead of defining a specific variable for every possible parameter .
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: a5fb981acea5ce23d134ea5fbb5f79d274783a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fb981acea5ce23d134ea5fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 11 12:50:53 2007 +0100 Makedll.rules: Add a generic EXTRADLLFLAGS variable instead of defining a specific variable for every possible parameter. --- dlls/Makedll.rules.in | 3 +-- dlls/kernel32/Makefile.in | 3 +-- dlls/ntdll/Makefile.in | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 3162175..45a8836 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -4,7 +4,6 @@ # MODULE : name of the main module being built # EXTRALIBS : extra libraries to link in (optional) # SPEC_SRCS16 : interface definition files for 16-bit dlls (optional) -# SUBSYSTEM : (optional) subsystem (for native dlls) # # plus all variables required by the global Make.rules.in # @@ -32,7 +31,7 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) # Rules for .so files $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(DLLFILENAME:%=-Wb,-F,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(EXTRADLLFLAGS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) # Rules for .dll files diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 7b0b4cc..aab68e6 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -7,8 +7,7 @@ MODULE = kernel32.dll IMPORTLIB = libkernel32.$(IMPLIBEXT) IMPORTS = ntdll EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@ -DLLFILENAME = KERNEL32.dll -BASEADDRESS = 0x7b800000 +EXTRADLLFLAGS = -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 SPEC_SRCS16 = \ comm.drv.spec \ diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 2156d4a..4ff9a91 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = ntdll.dll IMPORTLIB = libntdll.$(IMPLIBEXT) EXTRALIBS = @IOKITLIB@ -BASEADDRESS = 0x7bc00000 +EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000 C_SRCS = \ actctx.c \

1 0

Stefan Dösinger : wined3d: Use the adapter to read the display mode.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: 7f10ee453a88bd77ad754be9bbed679200facfb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f10ee453a88bd77ad754be9b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 6 23:43:25 2007 +0100 wined3d: Use the adapter to read the display mode. --- dlls/wined3d/device.c | 27 ++++++++++----------------- dlls/wined3d/directx.c | 13 +++++++------ dlls/wined3d/swapchain.c | 26 +++++--------------------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 23 insertions(+), 44 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2a80636..798f310 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1402,6 +1402,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic HRESULT hr = WINED3D_OK; IUnknown *bufferParent; BOOL displaymode_set = FALSE; + WINED3DDISPLAYMODE Mode; + const StaticPixelFormatDesc *formatDesc; TRACE("(%p) : Created Aditional Swap Chain\n", This); @@ -1439,10 +1441,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic return WINED3DERR_NOTAVAILABLE; } - object->orig_width = GetSystemMetrics(SM_CXSCREEN); - object->orig_height = GetSystemMetrics(SM_CYSCREEN); - object->orig_fmt = pixelformat_for_depth(GetDeviceCaps(hDc, BITSPIXEL) * GetDeviceCaps(hDc, PLANES)); - ReleaseDC(object->win_handle, hDc); + /* Get info on the current display setup */ + IWineD3D_GetAdapterDisplayMode(This->wineD3D, This->adapter->num, &Mode); + object->orig_width = Mode.Width; + object->orig_height = Mode.Height; + object->orig_fmt = Mode.Format; + formatDesc = getFormatDescEntry(Mode.Format, NULL, NULL); /** MSDN: If Windowed is TRUE and either of the BackBufferWidth/Height values is zero, * then the corresponding dimension of the client area of the hDeviceWindow @@ -1507,14 +1511,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic if (!pPresentationParameters->Windowed) { DEVMODEW devmode; - HDC hdc; int bpp = 0; RECT clip_rc; - /* Get info on the current display setup */ - hdc = GetDC(0); - bpp = GetDeviceCaps(hdc, BITSPIXEL); - ReleaseDC(0, hdc); + bpp = formatDesc->bpp * 8; /* Change the display settings */ memset(&devmode, 0, sizeof(devmode)); @@ -1641,23 +1641,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic error: if (displaymode_set) { DEVMODEW devmode; - HDC hdc; - int bpp = 0; RECT clip_rc; SetRect(&clip_rc, 0, 0, object->orig_width, object->orig_height); ClipCursor(NULL); - /* Get info on the current display setup */ - hdc = GetDC(0); - bpp = GetDeviceCaps(hdc, BITSPIXEL); - ReleaseDC(0, hdc); - /* Change the display settings */ memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); devmode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - devmode.dmBitsPerPel = (bpp >= 24) ? 32 : bpp; /* Stupid XVidMode cannot change bpp */ + devmode.dmBitsPerPel = (formatDesc->bpp >= 3) ? 32 : formatDesc->bpp * 8; /* Stupid XVidMode cannot change bpp */ devmode.dmPelsWidth = object->orig_width; devmode.dmPelsHeight = object->orig_height; ChangeDisplaySettingsExW(This->adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 43d2a79..71525a0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2698,7 +2698,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, IWineD3DDeviceImpl *object = NULL; IWineD3DImpl *This = (IWineD3DImpl *)iface; - HDC hDC; + WINED3DDISPLAYMODE mode; int i; /* Validate the adapter number. If no adapters are available(no GL), ignore the adapter @@ -2762,11 +2762,11 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, object->state = WINED3D_OK; /* Get the initial screen setup for ddraw */ - object->ddraw_width = GetSystemMetrics(SM_CXSCREEN); - object->ddraw_height = GetSystemMetrics(SM_CYSCREEN); - hDC = GetDC(0); - object->ddraw_format = pixelformat_for_depth(GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES)); - ReleaseDC(0, hDC); + IWineD3DImpl_GetAdapterDisplayMode(iface, Adapter, &mode); + + object->ddraw_width = mode.Width; + object->ddraw_height = mode.Height; + object->ddraw_format = mode.Format; for(i = 0; i < PATCHMAP_SIZE; i++) { list_init(&object->patches[i]); @@ -2933,6 +2933,7 @@ BOOL InitAdapters(void) { HDC hdc; TRACE("Initializing default adapter\n"); + Adapters[0].num = 0; Adapters[0].monitorPoint.x = -1; Adapters[0].monitorPoint.y = -1; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d27e707..28fd54b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -464,30 +464,14 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *i static HRESULT WINAPI IWineD3DSwapChainImpl_GetDisplayMode(IWineD3DSwapChain *iface, WINED3DDISPLAYMODE*pMode) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; - HDC hdc; - int bpp = 0; - - pMode->Width = GetSystemMetrics(SM_CXSCREEN); - pMode->Height = GetSystemMetrics(SM_CYSCREEN); - pMode->RefreshRate = 85; /* FIXME: How to identify? */ - - hdc = GetDC(0); - bpp = GetDeviceCaps(hdc, BITSPIXEL); - ReleaseDC(0, hdc); - - switch (bpp) { - case 8: pMode->Format = WINED3DFMT_R8G8B8; break; - case 16: pMode->Format = WINED3DFMT_R5G6B5; break; - case 24: /*pMode->Format = WINED3DFMT_R8G8B8; break; */ /* 32bpp and 24bpp can be aliased for X */ - case 32: pMode->Format = WINED3DFMT_A8R8G8B8; break; - default: - FIXME("Unrecognized display mode format\n"); - pMode->Format = WINED3DFMT_UNKNOWN; - } + HRESULT hr; + + TRACE("(%p)->(%p): Calling GetAdapterDisplayMode\n", This, pMode); + hr = IWineD3D_GetAdapterDisplayMode(This->wineD3DDevice->wineD3D, This->wineD3DDevice->adapter->num, pMode); TRACE("(%p) : returning w(%d) h(%d) rr(%d) fmt(%u,%s)\n", This, pMode->Width, pMode->Height, pMode->RefreshRate, pMode->Format, debug_d3dformat(pMode->Format)); - return WINED3D_OK; + return hr; } static HRESULT WINAPI IWineD3DSwapChainImpl_GetDevice(IWineD3DSwapChain *iface, IWineD3DDevice**ppDevice) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6806bfe..6207162 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -574,6 +574,7 @@ typedef struct WineD3D_PixelFormat typedef struct GLPixelFormatDesc GLPixelFormatDesc; struct WineD3DAdapter { + UINT num; POINT monitorPoint; WineD3D_GL_Info gl_info; const char *driver;

1 0

Lei Zhang : quartz: Add IFilterGraph2 interface and stubs.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: cff265950a9c9e3e684ff99747800987851426de URL: http://source.winehq.org/git/wine.git/?a=commit;h=cff265950a9c9e3e684ff9974… Author: Lei Zhang <thestig(a)google.com> Date: Mon Dec 10 23:40:19 2007 -0800 quartz: Add IFilterGraph2 interface and stubs. --- dlls/quartz/filtergraph.c | 185 +++++++++++++++++++++++---------------- dlls/quartz/tests/filtergraph.c | 9 +- 2 files changed, 116 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cff265950a9c9e3e684ff…

1 0

Andrew Riedi : user32: Test the initial state of the cursor.
by Alexandre Julliard 11 Dec '07

11 Dec '07

Module: wine Branch: master Commit: 00b55015245a4f5f6ef6811fdd26837c59f2ba62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b55015245a4f5f6ef6811fd… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Mon Dec 10 23:24:54 2007 -0800 user32: Test the initial state of the cursor. --- dlls/user32/tests/cursoricon.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index d7d5fa6..781282c 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -238,6 +238,23 @@ static void test_CopyImage_Bitmap(int depth) HeapFree(GetProcessHeap(), 0, info); } +static void test_initial_cursor(void) +{ + HCURSOR cursor, cursor2; + DWORD error; + + cursor = GetCursor(); + + /* Check what handle GetCursor() returns if a cursor is not set yet. */ + SetLastError(0xdeadbeef); + cursor2 = LoadCursor(NULL, IDC_WAIT); + todo_wine { + ok(cursor == cursor2, "cursor (%p) is not IDC_WAIT (%p).\n", cursor, cursor2); + } + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: 0x%08x\n", error); +} + static void test_icon_info_dbg(HICON hIcon, UINT exp_cx, UINT exp_cy, UINT exp_bpp, int line) { ICONINFO info; @@ -460,6 +477,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); + test_initial_cursor(); test_CreateIcon(); test_DestroyCursor(); }

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
83
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 December 2007