January 2013 - Wine-Commits

Henri Verbeet : ddraw: Explicitly create a wined3d object without 3D capabilities when creating a normal wined3d object fails .
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: 7595a580855fa141f0f3a10399ee8da76a1b1160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7595a580855fa141f0f3a1039… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:09 2013 +0100 ddraw: Explicitly create a wined3d object without 3D capabilities when creating a normal wined3d object fails. --- dlls/ddraw/ddraw.c | 12 +++++++--- dlls/ddraw/main.c | 11 +++++++++- dlls/wined3d/directx.c | 52 ++++++++++++++++++++++++------------------------ include/wine/wined3d.h | 1 + 4 files changed, 45 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e88f67e..ca6f8d5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5267,11 +5267,15 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS); - if (!ddraw->wined3d) + if (!(ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) { - WARN("Failed to create a wined3d object.\n"); - return E_OUTOFMEMORY; + if (!(ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + { + WARN("Failed to create a wined3d object.\n"); + return E_FAIL; + } + + WARN("Created a wined3d object without 3D support.\n"); } hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 51f9dda..e79b471 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -383,7 +383,16 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex FIXME("flags 0x%08x not handled\n", flags); TRACE("Enumerating ddraw interfaces\n"); - wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS); + if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) + { + if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + { + WARN("Failed to create a wined3d object.\n"); + return E_FAIL; + } + + WARN("Created a wined3d object without 3D support.\n"); + } __TRY { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d541f4d..2190689 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5406,7 +5406,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) HDC hdc = GetDC( 0 ); const struct opengl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); ReleaseDC( 0, hdc ); - if (!wgl_driver || wgl_driver == (void *)-1) goto nogl_adapter; + if (!wgl_driver || wgl_driver == (void *)-1) return FALSE; gl_info->gl_ops.wgl = wgl_driver->wgl; gl_info->gl_ops.gl = wgl_driver->gl; } @@ -5433,7 +5433,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) { DWORD err = GetLastError(); ERR("Failed to set adapter LUID (%#x).\n", err); - goto nogl_adapter; + return FALSE; } TRACE("Allocated LUID %08x:%08x for adapter.\n", adapter->luid.HighPart, adapter->luid.LowPart); @@ -5441,20 +5441,20 @@ static BOOL InitAdapters(struct wined3d *wined3d) if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) { ERR("Failed to get a gl context for default adapter\n"); - goto nogl_adapter; + return FALSE; } ret = wined3d_adapter_init_gl_caps(adapter); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - goto nogl_adapter; + return FALSE; } ret = initPixelFormats(&adapter->gl_info, adapter->driver_info.vendor); if(!ret) { ERR("Failed to init gl formats\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); - goto nogl_adapter; + return FALSE; } hdc = fake_gl_ctx.dc; @@ -5595,7 +5595,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); HeapFree(GetProcessHeap(), 0, adapter->cfgs); - goto nogl_adapter; + return FALSE; } } @@ -5609,26 +5609,23 @@ static BOOL InitAdapters(struct wined3d *wined3d) TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count); return TRUE; +} -nogl_adapter: - /* Initialize an adapter for ddraw-only memory counting */ - memset(wined3d->adapters, 0, sizeof(wined3d->adapters)); - wined3d->adapters[0].ordinal = 0; - wined3d->adapters[0].opengl = FALSE; - wined3d->adapters[0].monitorPoint.x = -1; - wined3d->adapters[0].monitorPoint.y = -1; +static void wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) +{ + memset(adapter, 0, sizeof(*adapter)); + adapter->ordinal = ordinal; + adapter->monitorPoint.x = -1; + adapter->monitorPoint.y = -1; - wined3d->adapters[0].driver_info.name = "Display"; - wined3d->adapters[0].driver_info.description = "WineD3D DirectDraw Emulation"; + adapter->driver_info.name = "Display"; + adapter->driver_info.description = "WineD3D DirectDraw Emulation"; if (wined3d_settings.emulated_textureram) - wined3d->adapters[0].TextureRam = wined3d_settings.emulated_textureram; + adapter->TextureRam = wined3d_settings.emulated_textureram; else - wined3d->adapters[0].TextureRam = 8 * 1024 * 1024; /* This is plenty for a DDraw-only card */ - - initPixelFormatsNoGL(&wined3d->adapters[0].gl_info); + adapter->TextureRam = 128 * 1024 * 1024; - wined3d->adapter_count = 1; - return FALSE; + initPixelFormatsNoGL(&adapter->gl_info); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} @@ -5645,14 +5642,17 @@ HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) wined3d->ref = 1; wined3d->flags = flags; + if (flags & WINED3D_NO3D) + { + wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); + wined3d->adapter_count = 1; + return WINED3D_OK; + } + if (!InitAdapters(wined3d)) { WARN("Failed to initialize adapters.\n"); - if (version > 7) - { - MESSAGE("Direct3D%u is not available without OpenGL.\n", version); - return E_FAIL; - } + return E_FAIL; } return WINED3D_OK; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 77c76ab..7aa9651 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1220,6 +1220,7 @@ enum wined3d_display_rotation #define WINED3DDEVCAPS_NPATCHES 0x01000000 #define WINED3D_LEGACY_DEPTH_BIAS 0x00000001 +#define WINED3D_NO3D 0x00000002 /* dwDDFX */ /* arithmetic stretching along y axis */

1 0

André Hentschel : tools: Upgrade the config.guess/ config.sub scripts.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: bd72767eed48a2af463c1c41251b5772f73d81ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd72767eed48a2af463c1c412… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 13 23:26:35 2013 +0100 tools: Upgrade the config.guess/config.sub scripts. --- tools/config.guess | 74 ++++++++++++++++++++------------- tools/config.sub | 114 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 113 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd72767eed48a2af463c1…

1 0

Nikolay Sivov : comctl32/listview: Update focus index when new item data is already there.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: dbd997c3c9284749a06d8b645680c78814bb28c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd997c3c9284749a06d8b645… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 12 21:29:38 2013 +0400 comctl32/listview: Update focus index when new item data is already there. --- dlls/comctl32/listview.c | 32 +++++++++++++++----- dlls/comctl32/tests/listview.c | 63 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bb6d1b2..75aa51b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4164,7 +4164,7 @@ static inline BOOL is_assignable_item(const LVITEMW *lpLVItem, LONG lStyle) /*** * DESCRIPTION: - * Helper for LISTVIEW_SetItemT *only*: sets item attributes. + * Helper for LISTVIEW_SetItemT and LISTVIEW_InsertItemT: sets item attributes. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure @@ -4256,6 +4256,15 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL return FALSE; } + /* When item is inserted we need to shift existing focus index if new item has lower index. */ + if (isNew && (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) && + /* this means we won't hit a focus change path later */ + ((uChanged & LVIF_STATE) == 0 || (!(lpLVItem->state & LVIS_FOCUSED) && (infoPtr->nFocusedItem != lpLVItem->iItem)))) + { + if (infoPtr->nFocusedItem != -1 && (lpLVItem->iItem <= infoPtr->nFocusedItem)) + infoPtr->nFocusedItem++; + } + if (!uChanged) return TRUE; *bChanged = TRUE; @@ -4288,7 +4297,14 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL { ranges_delitem(infoPtr->selectionRanges, lpLVItem->iItem); } - /* if we are asked to change focus, and we manage it, do it */ + /* If we are asked to change focus, and we manage it, do it. + It's important to have all new item data stored at this point, + cause changing existing focus could result in redrawing operation, + which in turn could ask for disp data, application should see all data + for inserted item when processing LVN_GETDISPINFO. + + The way this works application will see nested item change notifications - + changed item notifications interrupted by ones from item loosing focus. */ if (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) { if (lpLVItem->state & LVIS_FOCUSED) @@ -4320,7 +4336,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL /* if we're inserting the item, we're done */ if (isNew) return TRUE; - + /* send LVN_ITEMCHANGED notification */ if (lpLVItem->mask & LVIF_PARAM) nmlv.lParam = lpLVItem->lParam; if (infoPtr->bDoChangeNotify) notify_listview(infoPtr, LVN_ITEMCHANGED, &nmlv); @@ -7680,7 +7696,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, LVITEMW item; HWND hwndSelf = infoPtr->hwndSelf; - TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); + TRACE("(item=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); if (infoPtr->dwStyle & LVS_OWNERDATA) return infoPtr->nItemCount++; @@ -7730,14 +7746,13 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, else nItem = min(lpLVItem->iItem, infoPtr->nItemCount); - TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); + TRACE("inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem); nItem = DPA_InsertPtr( infoPtr->hdpaItems, nItem, hdpaSubItems ); if (nItem == -1) goto fail; infoPtr->nItemCount++; /* shift indices first so they don't get tangled */ LISTVIEW_ShiftIndices(infoPtr, nItem, 1); - LISTVIEW_ShiftFocus(infoPtr, infoPtr->nFocusedItem, nItem, 1); /* set the item attributes */ if (lpLVItem->mask & (LVIF_GROUPID|LVIF_COLUMNS)) @@ -7763,6 +7778,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, item.state &= ~LVIS_STATEIMAGEMASK; item.state |= INDEXTOSTATEIMAGEMASK(1); } + if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed)) goto undo; /* make room for the position, if we are in the right mode */ @@ -7776,9 +7792,9 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, goto undo; } } - + /* send LVN_INSERTITEM notification */ - ZeroMemory(&nmlv, sizeof(NMLISTVIEW)); + memset(&nmlv, 0, sizeof(NMLISTVIEW)); nmlv.iItem = nItem; nmlv.lParam = lpItem->lParam; notify_listview(infoPtr, LVN_INSERTITEM, &nmlv); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index cff6e92..2fb7cb5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -363,6 +363,15 @@ static const struct message listview_header_set_imagelist[] = { { 0 } }; +static const struct message parent_insert_focused_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -5434,6 +5443,58 @@ static void test_deleteitem(void) DestroyWindow(hwnd); } +static void test_insertitem(void) +{ + LVITEMA item; + UINT state; + HWND hwnd; + INT ret; + + hwnd = create_listview_control(LVS_REPORT); + + /* insert item 0 focused */ + item.mask = LVIF_STATE; + item.state = LVIS_FOCUSED; + item.stateMask = LVIS_FOCUSED; + item.iItem = 0; + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 0, "got %d\n", ret); + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* insert item 1, focus shift */ + item.mask = LVIF_STATE; + item.state = LVIS_FOCUSED; + item.stateMask = LVIS_FOCUSED; + item.iItem = 1; + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 1, "got %d\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", TRUE); + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + /* insert item 2, no focus shift */ + item.mask = LVIF_STATE; + item.state = 0; + item.stateMask = LVIS_FOCUSED; + item.iItem = 2; + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 2, "got %d\n", ret); + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); + ok(state == LVIS_FOCUSED, "got %x\n", state); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -5502,6 +5563,7 @@ START_TEST(listview) test_LVM_SETITEMTEXT(); test_imagelists(); test_deleteitem(); + test_insertitem(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -5533,6 +5595,7 @@ START_TEST(listview) test_LVS_EX_HEADERINALLVIEWS(); test_deleteitem(); test_multiselect(); + test_insertitem(); unload_v6_module(ctx_cookie, hCtx);

1 0

Dmitry Timoshkov : wineps.drv: Default page dimensions are part of DEVMODE, remove an old hack.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: a3c832593c35ea074969e808a1bda6d23ac6e6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c832593c35ea074969e808a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 14 11:16:05 2013 +0800 wineps.drv: Default page dimensions are part of DEVMODE, remove an old hack. --- dlls/wineps.drv/init.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 2085a47..2a7c90d 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -612,7 +612,6 @@ static struct list printer_list = LIST_INIT( printer_list ); */ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) { - DWORD needed, res, dwPaperSize; PRINTERINFO *pi; FONTNAME *font; const AFM *afm; @@ -678,22 +677,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) PSDRV_MergeDevmodes(pi->Devmode, &dm, pi); } - /* - * This is a hack. The default paper size should be read in as part of - * the Devmode structure, but Wine doesn't currently provide a convenient - * way to configure printers. - */ - res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "Paper Size", NULL, - (LPBYTE)&dwPaperSize, sizeof(DWORD), &needed); - if (res == ERROR_SUCCESS) - pi->Devmode->dmPublic.u1.s1.dmPaperSize = (SHORT) dwPaperSize; - else if (res == ERROR_FILE_NOT_FOUND) - TRACE ("No 'Paper Size' for printer '%s'\n", debugstr_w(name)); - else { - ERR ("GetPrinterDataA returned %i\n", res); - goto fail; - } - /* Duplex is indicated by the setting of the DM_DUPLEX bit in dmFields. WinDuplex == 0 is a special case which means that the ppd has a *DefaultDuplex: NotCapable entry. In this case we'll try not to confuse

1 0

Dmitry Timoshkov : wineps.drv: Don't cast away 'const' from DEVMODE provided as input.
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: d7687bed6ad8abc37996706cc41c5e888a5274e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7687bed6ad8abc37996706cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 14 11:16:38 2013 +0800 wineps.drv: Don't cast away 'const' from DEVMODE provided as input. --- dlls/wineps.drv/driver.c | 8 ++++---- dlls/wineps.drv/init.c | 4 ++-- dlls/wineps.drv/psdrv.h | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 8ec51a2..ef255b7 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -45,7 +45,7 @@ static inline int paper_size_from_points( float size ) return size * 254 / 72; } -INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ) +INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ) { INPUTSLOT *slot; @@ -56,7 +56,7 @@ INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ) return NULL; } -PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ) +PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) { PAGESIZE *page; @@ -67,7 +67,7 @@ PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ) return NULL; } -DUPLEX *find_duplex( PPD *ppd, PSDRV_DEVMODE *dm ) +DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ) { DUPLEX *duplex; WORD win_duplex = dm->dmPublic.dmFields & DM_DUPLEX ? dm->dmPublic.dmDuplex : 0; @@ -88,7 +88,7 @@ DUPLEX *find_duplex( PPD *ppd, PSDRV_DEVMODE *dm ) * Updates dm1 with some fields from dm2 * */ -void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *pi ) +void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, const PSDRV_DEVMODE *dm2, PRINTERINFO *pi ) { /* some sanity checks here on dm2 */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 2a7c90d..5439ff5 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -324,7 +324,7 @@ static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, if (output && *output) physDev->job.output = strdupW( output ); if(initData) - PSDRV_MergeDevmodes(physDev->Devmode, (PSDRV_DEVMODE *)initData, pi); + PSDRV_MergeDevmodes(physDev->Devmode, (const PSDRV_DEVMODE *)initData, pi); PSDRV_UpdateDevCaps(physDev); SelectObject( (*pdev)->hdc, PSDRV_DefaultFont ); @@ -379,7 +379,7 @@ static HDC PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) if (lpInitData) { - PSDRV_MergeDevmodes(physDev->Devmode, (PSDRV_DEVMODE *)lpInitData, physDev->pi); + PSDRV_MergeDevmodes(physDev->Devmode, (const PSDRV_DEVMODE *)lpInitData, physDev->pi); PSDRV_UpdateDevCaps(physDev); } return dev->hdc; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 12ce526..ffae328 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -409,9 +409,9 @@ extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; -extern INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ); -extern PAGESIZE *find_pagesize( PPD *ppd, PSDRV_DEVMODE *dm ); -extern DUPLEX *find_duplex( PPD *ppd, PSDRV_DEVMODE *dm ); +extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ); +extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ); +extern DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ); /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, @@ -462,7 +462,7 @@ extern INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) DECLSPEC_HIDDEN; extern BOOL PSDRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL PSDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern void PSDRV_MergeDevmodes(PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, +extern void PSDRV_MergeDevmodes(PSDRV_DEVMODE *dm1, const PSDRV_DEVMODE *dm2, PRINTERINFO *pi) DECLSPEC_HIDDEN; extern BOOL PSDRV_GetFontMetrics(void) DECLSPEC_HIDDEN; extern PPD *PSDRV_ParsePPD(char *fname, HANDLE printer) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : ddraw: Only check dwFlags if we actually have a D3DLIGHT2 structure in d3d_light_SetLight ().
by Alexandre Julliard Jan. 14, 2013

Jan. 14, 2013

Module: wine Branch: master Commit: d9051bbe93b470197a22cf1e21d26f5b7fb9ecbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9051bbe93b470197a22cf1e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:07 2013 +0100 ddraw: Only check dwFlags if we actually have a D3DLIGHT2 structure in d3d_light_SetLight(). --- dlls/ddraw/light.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index ebc1410..1d81803 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -210,7 +210,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ light7->dltType = data->dltType; light7->dcvDiffuse = data->dcvColor; - if (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR) + if (data->dwSize >= sizeof(D3DLIGHT2) && (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR)) light7->dcvSpecular = data->dcvColor; else light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value;

1 0

Hans Leidekker : ws2_32: Set SO_REUSEPORT in addition to SO_REUSEADDR on MacOS.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: 197041f1ffe4841b0514701fd22fd4b743a41cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=197041f1ffe4841b0514701fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 11 17:22:59 2013 +0100 ws2_32: Set SO_REUSEPORT in addition to SO_REUSEADDR on MacOS. --- dlls/ws2_32/socket.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index eeb5265..c390828 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4452,6 +4452,15 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, if (setsockopt(fd, level, optname, optval, optlen) == 0) { +#ifdef __APPLE__ + if (level == SOL_SOCKET && optname == SO_REUSEADDR && + setsockopt(fd, level, SO_REUSEPORT, optval, optlen) != 0) + { + SetLastError(wsaErrno()); + release_sock_fd( s, fd ); + return SOCKET_ERROR; + } +#endif release_sock_fd( s, fd ); return 0; }

1 0

Detlef Riekenberg : include: Add definitions for SHGetStockIconInfo.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: b81eb2ee8bb3a3c7dd3bb545d1fa020ee4ca4ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81eb2ee8bb3a3c7dd3bb545d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 11 00:49:22 2013 +0100 include: Add definitions for SHGetStockIconInfo. --- include/shellapi.h | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 127 insertions(+), 0 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index 23457f2..d2b4081 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -495,6 +495,133 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR,LPSHQUERYRBINFO); * Misc */ +typedef enum SHSTOCKICONID +{ + SIID_INVALID=-1, + SIID_DOCNOASSOC, + SIID_DOCASSOC, + SIID_APPLICATION, + SIID_FOLDER, + SIID_FOLDEROPEN, + SIID_DRIVE525, + SIID_DRIVE35, + SIID_DRIVERREMOVE, + SIID_DRIVERFIXED, + SIID_DRIVERNET, + SIID_DRIVERNETDISABLE, + SIID_DRIVERCD, + SIID_DRIVERRAM, + SIID_WORLD, + /* Missing: 14 */ + SIID_SERVER = 15, + SIID_PRINTER, + SIID_MYNETWORK, + /* Missing: 18 - 21 */ + SIID_FIND = 22, + SIID_HELP, + /* Missing: 24 - 27 */ + SIID_SHARE = 28, + SIID_LINK, + SIID_SLOWFILE, + SIID_RECYCLER, + SIID_RECYCLERFULL, + /* Missing: 33 - 39 */ + SIID_MEDIACDAUDIO = 40, + /* Missing: 41 - 46 */ + SIID_LOCK = 47, + /* Missing: 48 */ + SIID_AUTOLIST = 49, + SIID_PRINTERNET, + SIID_SERVERSHARE, + SIID_PRINTERFAX, + SIID_PRINTERFAXNET, + SIID_PRINTERFILE, + SIID_STACK, + SIID_MEDIASVCD, + SIID_STUFFEDFOLDER, + SIID_DRIVEUNKNOWN, + SIID_DRIVEDVD, + SIID_MEDIADVD, + SIID_MEDIADVDRAM, + SIID_MEDIADVDRW, + SIID_MEDIADVDR, + SIID_MEDIADVDROM, + SIID_MEDIACDAUDIOPLUS, + SIID_MEDIACDRW, + SIID_MEDIACDR, + SIID_MEDIACDBURN, + SIID_MEDIABLANKCD, + SIID_MEDIACDROM, + SIID_AUDIOFILES, + SIID_IMAGEFILES, + SIID_VIDEOFILES, + SIID_MIXEDFILES, + SIID_FOLDERBACK, + SIID_FOLDERFRONT, + SIID_SHIELD, + SIID_WARNING, + SIID_INFO, + SIID_ERROR, + SIID_KEY, + SIID_SOFTWARE, + SIID_RENAME, + SIID_DELETE, + SIID_MEDIAAUDIODVD, + SIID_MEDIAMOVIEDVD, + SIID_MEDIAENHANCEDCD, + SIID_MEDIAENHANCEDDVD, + SIID_MEDIAHDDVD, + SIID_MEDIABLUERAY, + SIID_MEDIAVCD, + SIID_MEDIADVDPLUSR, + SIID_MEDIADVDPLUSRW, + SIID_DESKTOPPC, + SIID_MOBILEPC, + SIID_USERS, + SIID_MEDIASMARTMEDIA, + SIID_MEDIACOMPACTFLASH, + SIID_DEVICECELLPHONE, + SIID_DEVICECAMERA, + SIID_DEVICEVIDEOCAMERA, + SIID_DEVICEAUDIOPLAYER, + SIID_NETWORKCONNECT, + SIID_INTERNET, + SIID_ZIPFILE, + SIID_SETTINGS, + /* Missing: 107 - 131 */ + SIID_DRIVEHDDVD = 132, + SIID_DRIVEBD, + SIID_MEDIAHDDVDROM, + SIID_MEDIAHDDVDR, + SIID_MEDIAHDDVDRAM, + SIID_MEDIABDROM, + SIID_MEDIABDR, + SIID_MEDIABDRE, + SIID_CLUSTEREDDRIVE, + /* Missing: 141 - 174 */ + SIID_MAX_ICONS = 175 +}SHSTOCKICONID; + +typedef struct _SHSTOCKICONINFO +{ + DWORD cbSize; + HICON hIcon; + INT iSysImageIndex; + INT iIcon; + WCHAR szPath[MAX_PATH]; +} SHSTOCKICONINFO; + +/* flags for SHGetStockIconInfo */ +#define SHGSI_ICONLOCATION 0 +#define SHGSI_ICON SHGFI_ICON +#define SHGSI_SYSICONINDEX SHGFI_SYSICONINDEX +#define SHGSI_LINKOVERLAY SHGFI_LINKOVERLAY +#define SHGSI_SELECTED SHGFI_SELECTED +#define SHGSI_LARGEICON SHGFI_LARGEICON +#define SHGSI_SMALLICON SHGFI_SMALLICON +#define SHGSI_SHELLICONSIZE SHGFI_SHELLICONSIZE + +HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID, UINT, SHSTOCKICONINFO*); LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR,int*); HICON WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT); HICON WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);

1 0

Hans Leidekker : wbemprox: Implement Win32_Process::GetOwner.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: 24b66842c4d72676a3552f5888f80ce4bc76d51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b66842c4d72676a3552f588… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 11 17:22:14 2013 +0100 wbemprox: Implement Win32_Process::GetOwner. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 12 +++- dlls/wbemprox/process.c | 102 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/Makefile.in | 2 +- dlls/wbemprox/tests/query.c | 65 ++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 5 ++ 6 files changed, 183 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24b66842c4d72676a3552…

1 0

Hans Leidekker : wbemprox: Both signature parameters are optional in IWbemClassObject::GetMethod.
by Alexandre Julliard Jan. 11, 2013

Jan. 11, 2013

Module: wine Branch: master Commit: f7bf3876af9d0682cdc9347a4da816bd58e22b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bf3876af9d0682cdc9347a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 11 17:21:23 2013 +0100 wbemprox: Both signature parameters are optional in IWbemClassObject::GetMethod. --- dlls/wbemprox/class.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 994e76b..4e27c5c 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -847,15 +847,23 @@ static HRESULT WINAPI class_object_GetMethod( IWbemClassObject **ppOutSignature ) { struct class_object *co = impl_from_IWbemClassObject( iface ); + IWbemClassObject *in, *out; HRESULT hr; TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); - hr = create_signature( co->name, wszName, PARAM_IN, ppInSignature ); - if (hr != S_OK || !ppOutSignature) return hr; + hr = create_signature( co->name, wszName, PARAM_IN, &in ); + if (hr != S_OK) return hr; - hr = create_signature( co->name, wszName, PARAM_OUT, ppOutSignature ); - if (hr != S_OK) IWbemClassObject_Release( *ppInSignature ); + hr = create_signature( co->name, wszName, PARAM_OUT, &out ); + if (hr == S_OK) + { + if (ppInSignature) *ppInSignature = in; + else IWbemClassObject_Release( in ); + if (ppOutSignature) *ppOutSignature = out; + else IWbemClassObject_Release( out ); + } + else IWbemClassObject_Release( in ); return hr; }

1 0