January 2013 - Wine-commits

Ken Thomases : winemac: Make each Mac driver window track the HWND it' s associated with.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 177b67e6bd456d69cce687245e5773015ac3fee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177b67e6bd456d69cce687245… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:08:03 2013 -0600 winemac: Make each Mac driver window track the HWND it's associated with. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 19 +++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/window.c | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index e1e59f4..1f81cc6 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -32,6 +32,7 @@ BOOL floating; WineWindow* latentParentWindow; + void* hwnd; WineEventQueue* queue; void* surface; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4ca7a09..e647cd0 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -66,6 +66,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @property (nonatomic) BOOL floating; @property (retain, nonatomic) NSWindow* latentParentWindow; +(a)property (nonatomic) void* hwnd; @property (retain, nonatomic) WineEventQueue* queue; @property (nonatomic) void* surface; @@ -162,7 +163,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) @implementation WineWindow - @synthesize disabled, noActivate, floating, latentParentWindow, queue; + @synthesize disabled, noActivate, floating, latentParentWindow, hwnd, queue; @synthesize surface, surface_mutex; @synthesize shape, shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @@ -170,6 +171,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) + (WineWindow*) createWindowWithFeatures:(const struct macdrv_window_features*)wf windowFrame:(NSRect)window_frame + hwnd:(void*)hwnd queue:(WineEventQueue*)queue { WineWindow* window; @@ -195,6 +197,7 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) [window setHasShadow:wf->shadow]; [window setColorSpace:[NSColorSpace genericRGBColorSpace]]; [window setDelegate:window]; + window.hwnd = hwnd; window.queue = queue; contentView = [[[WineContentView alloc] initWithFrame:NSZeroRect] autorelease]; @@ -447,13 +450,14 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) * title bar, close box, etc.). */ macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, - CGRect frame, macdrv_event_queue queue) + CGRect frame, void* hwnd, macdrv_event_queue queue) { __block WineWindow* window; OnMainThread(^{ window = [[WineWindow createWindowWithFeatures:wf windowFrame:NSRectFromCGRect(frame) + hwnd:hwnd queue:(WineEventQueue*)queue] retain]; }); @@ -478,6 +482,17 @@ void macdrv_destroy_cocoa_window(macdrv_window w) } /*********************************************************************** + * macdrv_get_window_hwnd + * + * Get the hwnd that was set for the window at creation. + */ +void* macdrv_get_window_hwnd(macdrv_window w) +{ + WineWindow* window = (WineWindow*)w; + return window.hwnd; +} + +/*********************************************************************** * macdrv_set_cocoa_window_features * * Update a Cocoa window's features. diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 71b4c32..31bbb2d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -161,7 +161,7 @@ struct macdrv_window_state { }; extern macdrv_window macdrv_create_cocoa_window(const struct macdrv_window_features* wf, - CGRect frame, macdrv_event_queue queue) DECLSPEC_HIDDEN; + CGRect frame, void* hwnd, macdrv_event_queue queue) DECLSPEC_HIDDEN; extern void macdrv_destroy_cocoa_window(macdrv_window w) DECLSPEC_HIDDEN; extern void* macdrv_get_window_hwnd(macdrv_window w) DECLSPEC_HIDDEN; extern void macdrv_set_cocoa_window_features(macdrv_window w, diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 26dedf4..cd7be9e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -511,7 +511,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) TRACE("creating %p window %s whole %s client %s\n", data->hwnd, wine_dbgstr_rect(&data->window_rect), wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(&data->client_rect)); - data->cocoa_window = macdrv_create_cocoa_window(&wf, frame, thread_data->queue); + data->cocoa_window = macdrv_create_cocoa_window(&wf, frame, data->hwnd, thread_data->queue); if (!data->cocoa_window) goto done; set_cocoa_window_properties(data);

1 0

Ken Thomases : winemac: Implement MsgWaitForMultipleObjectsEx and infrastructure for processing events .
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 4e83d2fca0861906f40eae8c4ed7afe8513833a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e83d2fca0861906f40eae8c4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:08:08 2013 -0600 winemac: Implement MsgWaitForMultipleObjectsEx and infrastructure for processing events. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/event.c | 125 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/winemac.drv.spec | 1 + 4 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 0dfcbc4..1de19ef 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -4,6 +4,7 @@ EXTRALIBS = -framework AppKit C_SRCS = \ display.c \ + event.c \ gdi.c \ macdrv_main.c \ surface.c \ diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c new file mode 100644 index 0000000..fcef550 --- /dev/null +++ b/dlls/winemac.drv/event.c @@ -0,0 +1,125 @@ +/* + * MACDRV event driver + * + * Copyright 1993 Alexandre Julliard + * 1999 Noel Borthwick + * Copyright 2011, 2012, 2013 Ken Thomases for CodeWeavers Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include "macdrv.h" +#include "winuser.h" + +WINE_DEFAULT_DEBUG_CHANNEL(event); + + +/* return the name of an Mac event */ +static const char *dbgstr_event(int type) +{ + return wine_dbg_sprintf("Unknown event %d", type); +} + + +/*********************************************************************** + * get_event_mask + */ +static macdrv_event_mask get_event_mask(DWORD mask) +{ + if ((mask & QS_ALLINPUT) == QS_ALLINPUT) return -1; + return 0; +} + + +/*********************************************************************** + * macdrv_handle_event + */ +void macdrv_handle_event(macdrv_event *event) +{ + HWND hwnd = macdrv_get_window_hwnd(event->window); + const macdrv_event *prev; + struct macdrv_thread_data *thread_data = macdrv_thread_data(); + + TRACE("%s for hwnd/window %p/%p\n", dbgstr_event(event->type), hwnd, + event->window); + + prev = thread_data->current_event; + thread_data->current_event = event; + + switch (event->type) + { + default: + TRACE(" ignoring\n"); + break; + } + + thread_data->current_event = prev; +} + + +/*********************************************************************** + * process_events + */ +static int process_events(macdrv_event_queue queue, macdrv_event_mask mask) +{ + macdrv_event event; + int count = 0; + + while (macdrv_get_event_from_queue(queue, mask, &event)) + { + count++; + macdrv_handle_event(&event); + macdrv_cleanup_event(&event); + } + if (count) TRACE("processed %d events\n", count); + return count; +} + + +/*********************************************************************** + * MsgWaitForMultipleObjectsEx (MACDRV.@) + */ +DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handles, + DWORD timeout, DWORD mask, DWORD flags) +{ + DWORD ret; + struct macdrv_thread_data *data = macdrv_thread_data(); + macdrv_event_mask event_mask = get_event_mask(mask); + + TRACE("count %d, handles %p, timeout %u, mask %x, flags %x\n", count, + handles, timeout, mask, flags); + + if (!data) + { + if (!count && !timeout) return WAIT_TIMEOUT; + return WaitForMultipleObjectsEx(count, handles, flags & MWMO_WAITALL, + timeout, flags & MWMO_ALERTABLE); + } + + if (data->current_event) event_mask = 0; /* don't process nested events */ + + if (process_events(data->queue, event_mask)) ret = count - 1; + else if (count || timeout) + { + ret = WaitForMultipleObjectsEx(count, handles, flags & MWMO_WAITALL, + timeout, flags & MWMO_ALERTABLE); + if (ret == count - 1) process_events(data->queue, event_mask); + } + else ret = WAIT_TIMEOUT; + + return ret; +} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index dee2fd8..7fe4109 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -83,6 +83,7 @@ enum macdrv_window_messages struct macdrv_thread_data { macdrv_event_queue queue; + const macdrv_event *current_event; }; extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 53b9785..f2ffffc 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -9,6 +9,7 @@ @ cdecl DestroyWindow(long) macdrv_DestroyWindow @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo +@ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx @ cdecl SetLayeredWindowAttributes(long long long long) macdrv_SetLayeredWindowAttributes @ cdecl SetParent(long long long) macdrv_SetParent @ cdecl SetWindowRgn(long long long) macdrv_SetWindowRgn

1 0

Ken Thomases : winemac: Implement a WINDOW_CLOSE_REQUESTED event to allow closing windows.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: ed367c504df4703677abfa42dc7620cc58a55d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed367c504df4703677abfa42d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:08:12 2013 -0600 winemac: Implement a WINDOW_CLOSE_REQUESTED event to allow closing windows. --- dlls/winemac.drv/cocoa_window.m | 4 +++ dlls/winemac.drv/event.c | 16 ++++++++++++- dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 5 ++++ dlls/winemac.drv/macdrv_main.c | 2 + dlls/winemac.drv/window.c | 49 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e647cd0..36bd600 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -437,6 +437,10 @@ static BOOL frame_intersects_screens(NSRect frame, NSArray* screens) */ - (BOOL)windowShouldClose:(id)sender { + macdrv_event event; + event.type = WINDOW_CLOSE_REQUESTED; + event.window = (macdrv_window)[self retain]; + [queue postEvent:&event]; return NO; } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index fcef550..effaa92 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -31,6 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(event); /* return the name of an Mac event */ static const char *dbgstr_event(int type) { + static const char * const event_names[] = { + "WINDOW_CLOSE_REQUESTED", + }; + + if (0 <= type && type < NUM_EVENT_TYPES) return event_names[type]; return wine_dbg_sprintf("Unknown event %d", type); } @@ -40,8 +45,14 @@ static const char *dbgstr_event(int type) */ static macdrv_event_mask get_event_mask(DWORD mask) { + macdrv_event_mask event_mask = 0; + if ((mask & QS_ALLINPUT) == QS_ALLINPUT) return -1; - return 0; + + if (mask & QS_POSTMESSAGE) + event_mask |= event_mask_for_type(WINDOW_CLOSE_REQUESTED); + + return event_mask; } @@ -62,6 +73,9 @@ void macdrv_handle_event(macdrv_event *event) switch (event->type) { + case WINDOW_CLOSE_REQUESTED: + macdrv_window_close_requested(hwnd); + break; default: TRACE(" ignoring\n"); break; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 7fe4109..524408f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -117,4 +117,6 @@ extern struct window_surface *create_surface(macdrv_window window, const RECT *r extern void set_window_surface(macdrv_window window, struct window_surface *window_surface) DECLSPEC_HIDDEN; extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha) DECLSPEC_HIDDEN; +extern void macdrv_window_close_requested(HWND hwnd) DECLSPEC_HIDDEN; + #endif /* __WINE_MACDRV_H */ diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 31bbb2d..f7f2f1d 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -121,6 +121,11 @@ extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDE /* event */ +enum { + WINDOW_CLOSE_REQUESTED, + NUM_EVENT_TYPES +}; + typedef uint32_t macdrv_event_mask; typedef struct macdrv_event { diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 4776dd3..2a9e0ac 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -35,6 +35,8 @@ DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; */ static BOOL process_attach(void) { + assert(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); + if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; macdrv_err_on = ERR_ON(macdrv); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index cd7be9e..e22a155 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1230,3 +1230,52 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, done: release_win_data(data); } + + +/*********************************************************************** + * macdrv_window_close_requested + * + * Handler for WINDOW_CLOSE_REQUESTED events. + */ +void macdrv_window_close_requested(HWND hwnd) +{ + /* Ignore the delete window request if the window has been disabled. This + * is to disallow applications from being closed while in a modal state. + */ + if (IsWindowEnabled(hwnd)) + { + HMENU hSysMenu; + + if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; + hSysMenu = GetSystemMenu(hwnd, FALSE); + if (hSysMenu) + { + UINT state = GetMenuState(hSysMenu, SC_CLOSE, MF_BYCOMMAND); + if (state == 0xFFFFFFFF || (state & (MF_DISABLED | MF_GRAYED))) + return; + } + if (GetActiveWindow() != hwnd) + { + LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, + (WPARAM)GetAncestor(hwnd, GA_ROOT), + MAKELPARAM(HTCLOSE, WM_NCLBUTTONDOWN)); + switch(ma) + { + case MA_NOACTIVATEANDEAT: + case MA_ACTIVATEANDEAT: + return; + case MA_NOACTIVATE: + break; + case MA_ACTIVATE: + case 0: + SetActiveWindow(hwnd); + break; + default: + WARN("unknown WM_MOUSEACTIVATE code %d\n", (int) ma); + break; + } + } + + PostMessageW(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + } +}

1 0

Christian Costa : d3dx9_36: Fill children info into ID3DXFileData object.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 5880ff01be8bdae02e8584a5e7744ef1e191f202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5880ff01be8bdae02e8584a5e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jan 21 08:41:02 2013 +0100 d3dx9_36: Fill children info into ID3DXFileData object. --- dlls/d3dx9_36/xfile.c | 67 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index afc0def..8020467 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -60,7 +60,10 @@ typedef struct { typedef struct { ID3DXFileData ID3DXFileData_iface; LONG ref; + BOOL reference; IDirectXFileData *dxfile_data; + ULONG nb_children; + ID3DXFileData **children; } ID3DXFileDataImpl; @@ -117,6 +120,11 @@ static ULONG WINAPI ID3DXFileDataImpl_Release(ID3DXFileData *iface) if (!ref) { + ULONG i; + + for (i = 0; i < This->nb_children; i++) + (This->children[i])->lpVtbl->Release(This->children[i]); + HeapFree(GetProcessHeap(), 0, This->children); IDirectXFileData_Release(This->dxfile_data); HeapFree(GetProcessHeap(), 0, This); } @@ -266,21 +274,70 @@ static const ID3DXFileDataVtbl ID3DXFileData_Vtbl = }; -static HRESULT ID3DXFileDataImpl_Create(IDirectXFileData *dxfile_data, ID3DXFileData **ret_iface) +static HRESULT ID3DXFileDataImpl_Create(IDirectXFileObject *dxfile_object, ID3DXFileData **ret_iface) { ID3DXFileDataImpl *object; + IDirectXFileObject *data_object; + HRESULT ret; - TRACE("(%p, %p)\n", dxfile_data, ret_iface); + TRACE("(%p, %p)\n", dxfile_object, ret_iface); *ret_iface = NULL; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->ID3DXFileData_iface.lpVtbl = &ID3DXFileData_Vtbl; object->ref = 1; - object->dxfile_data = dxfile_data; + + ret = IDirectXFileObject_QueryInterface(dxfile_object, &IID_IDirectXFileData, (void **)&object->dxfile_data); + if (FAILED(ret)) + { + IDirectXFileDataReference *reference; + + ret = IDirectXFileObject_QueryInterface(dxfile_object, &IID_IDirectXFileDataReference, (void **)&reference); + if (SUCCEEDED(ret)) + { + ret = IDirectXFileDataReference_Resolve(reference, &object->dxfile_data); + if (FAILED(ret)) + { + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + } + else + { + FIXME("Don't known what to do with binary object\n"); + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + } + + while (SUCCEEDED(ret = IDirectXFileData_GetNextObject(object->dxfile_data, &data_object))) + { + if (object->children) + object->children = HeapReAlloc(GetProcessHeap(), 0, object->children, sizeof(ID3DXFileData*) * (object->nb_children + 1)); + else + object->children = HeapAlloc(GetProcessHeap(), 0, sizeof(ID3DXFileData*)); + if (!object->children) + { + ret = E_OUTOFMEMORY; + break; + } + ret = ID3DXFileDataImpl_Create(data_object, &object->children[object->nb_children]); + if (ret != S_OK) + break; + object->nb_children++; + } + + if (ret != DXFILEERR_NOMOREOBJECTS) + { + (&object->ID3DXFileData_iface)->lpVtbl->Release(&object->ID3DXFileData_iface); + return ret; + } + + TRACE("Found %u children\n", object->nb_children); *ret_iface = &object->ID3DXFileData_iface; @@ -534,7 +591,7 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi ret = E_OUTOFMEMORY; break; } - ret = ID3DXFileDataImpl_Create(data_object, &object->children[object->nb_children]); + ret = ID3DXFileDataImpl_Create((IDirectXFileObject*)data_object, &object->children[object->nb_children]); if (ret != S_OK) break; object->nb_children++;

1 0

Henri Verbeet : ddraw: Avoid LPD3DVERTEXBUFFERDESC.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: 0b135993988534270b443f2975ba5d9654d00f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b135993988534270b443f297… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:33 2013 +0100 ddraw: Avoid LPD3DVERTEXBUFFERDESC. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 692220a..6158045 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1473,7 +1473,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer,IUnknown) STDMETHOD(ProcessVertices)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, IDirect3DVertexBuffer *src_buffer, DWORD src_idx, IDirect3DDevice3 *device, DWORD flags) PURE; - STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; + STDMETHOD(GetVertexBufferDesc)(THIS_ D3DVERTEXBUFFERDESC *desc) PURE; STDMETHOD(Optimize)(THIS_ IDirect3DDevice3 *device, DWORD flags) PURE; }; #undef INTERFACE @@ -1518,7 +1518,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer7,IUnknown) STDMETHOD(ProcessVertices)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, IDirect3DVertexBuffer7 *src_buffer, DWORD src_idx, IDirect3DDevice7 *device, DWORD flags) PURE; - STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; + STDMETHOD(GetVertexBufferDesc)(THIS_ D3DVERTEXBUFFERDESC *desc) PURE; STDMETHOD(Optimize)(THIS_ IDirect3DDevice7 *device, DWORD flags) PURE; STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, D3DDRAWPRIMITIVESTRIDEDDATA *data, DWORD fvf, IDirect3DDevice7 *device, DWORD flags) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPD3DDRAWPRIMITIVESTRIDEDDATA.
by Alexandre Julliard 21 Jan '13

21 Jan '13

Module: wine Branch: master Commit: ec1511ea0cdf7895483b1c0a828b9d2ff0213abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1511ea0cdf7895483b1c0a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 21 09:08:34 2013 +0100 ddraw: Avoid LPD3DDRAWPRIMITIVESTRIDEDDATA. --- include/d3d.h | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 6158045..22dafa8 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1177,8 +1177,11 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; - STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; - STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; + STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, DWORD flags) PURE; + STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, WORD *indices, DWORD index_count, + DWORD flags) PURE; STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer *vb, @@ -1322,8 +1325,11 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(DrawIndexedPrimitive)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD dwIndices, DWORD dwIndexCount, DWORD dwFlags) PURE; STDMETHOD(SetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; STDMETHOD(GetClipStatus)(THIS_ D3DCLIPSTATUS *clip_status) PURE; - STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; - STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; + STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, DWORD flags) PURE; + STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE primitive_type, DWORD fvf, + D3DDRAWPRIMITIVESTRIDEDDATA *strided_data, DWORD vertex_count, WORD *indices, DWORD index_count, + DWORD flags) PURE; STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb, DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb,

1 0

Alexandre Julliard : Wine release 1.5.22
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: website Branch: master Commit: 362d469bb84b2b6c5121c63565c0d66f815a9dbe URL: http://source.winehq.org/git/website.git/?a=commit;h=362d469bb84b2b6c5121c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 21:55:52 2013 +0100 Wine release 1.5.22 --- news/en/2013011801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2013011801.xml b/news/en/2013011801.xml new file mode 100644 index 0000000..6d1efdf --- /dev/null +++ b/news/en/2013011801.xml @@ -0,0 +1,16 @@ +<news> +<date>January 18, 2013</date> +<title>Wine 1.5.22 Released</title> +<body> + The Wine development release 1.5.22 is now available. + <a href="{$root}/announce/1.5.22">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine.</li> + <li>Beginnings of the Mac graphics driver.</li> + <li>Support for ARM64 platforms.</li> + <li>Fixes for RTL text in Uniscribe.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.22.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.22.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 9f18a03b14a3405fb04da73cb87f421576825cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f18a03b14a3405fb04da73cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 21:44:53 2013 +0100 Release 1.5.22. --- ANNOUNCE | 695 +++++++++++++++++++++++++++++++++++++++++-------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 482 insertions(+), 233 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f18a03b14a3405fb04da…

1 0

Tag wine-1.5.22 : Alexandre Julliard : Release 1.5.22
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: refs/tags/wine-1.5.22 Tag: 322899b46ce3f3b988a1a3a3875a61092784a511 URL: http://source.winehq.org/git/wine.git/?a=tag;h=322899b46ce3f3b988a1a3a3875a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 21:44:55 2013 +0100 Release 1.5.22

1 0

Jacek Caban : mshtml: Don't use PRInt32 in property getters implementations .
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: d83822adbe88e59589d7387c15e44f68c95620d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83822adbe88e59589d7387c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 18 14:05:50 2013 +0100 mshtml: Don't use PRInt32 in property getters implementations. --- dlls/mshtml/htmlevent.c | 8 ++++---- dlls/mshtml/htmlform.c | 4 +--- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlobject.c | 4 +--- dlls/mshtml/htmlselect.c | 8 ++++---- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 13095fb..68a3942 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -641,7 +641,7 @@ static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRInt32 x = 0; + LONG x = 0; TRACE("(%p)->(%p)\n", This, p); @@ -663,7 +663,7 @@ static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_clientY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRInt32 y = 0; + LONG y = 0; TRACE("(%p)->(%p)\n", This, p); @@ -705,7 +705,7 @@ static HRESULT WINAPI HTMLEventObj_get_offsetY(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRInt32 x = 0; + LONG x = 0; TRACE("(%p)->(%p)\n", This, p); @@ -727,7 +727,7 @@ static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_screenY(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - PRInt32 y = 0; + LONG y = 0; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 6459093..c48415a 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -391,18 +391,16 @@ static HRESULT WINAPI HTMLFormElement_put_length(IHTMLFormElement *iface, LONG v static HRESULT WINAPI HTMLFormElement_get_length(IHTMLFormElement *iface, LONG *p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - PRInt32 length; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLFormElement_GetLength(This->nsform, &length); + nsres = nsIDOMHTMLFormElement_GetLength(This->nsform, p); if(NS_FAILED(nsres)) { ERR("GetLength failed: %08x\n", nsres); return E_FAIL; } - *p = length; return S_OK; } diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index fb0e80b..7937161 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -291,7 +291,7 @@ static HRESULT WINAPI HTMLInputElement_put_maxLength(IHTMLInputElement *iface, L static HRESULT WINAPI HTMLInputElement_get_maxLength(IHTMLInputElement *iface, LONG *p) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - PRInt32 max_length; + LONG max_length; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 9e9bbdd..bcfbbe5 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -433,18 +433,16 @@ static HRESULT WINAPI HTMLObjectElement_put_vspace(IHTMLObjectElement *iface, LO static HRESULT WINAPI HTMLObjectElement_get_vspace(IHTMLObjectElement *iface, LONG *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - PRInt32 vspace; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLObjectElement_GetVspace(This->nsobject, &vspace); + nsres = nsIDOMHTMLObjectElement_GetVspace(This->nsobject, p); if(NS_FAILED(nsres)) { ERR("GetVspace failed: %08x\n", nsres); return E_FAIL; } - *p = vspace; return S_OK; } diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 8fceedf..ff609dd 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -250,16 +250,16 @@ static HRESULT WINAPI HTMLSelectElement_put_selectedIndex(IHTMLSelectElement *if static HRESULT WINAPI HTMLSelectElement_get_selectedIndex(IHTMLSelectElement *iface, LONG *p) { HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - PRInt32 idx = 0; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - nsres = nsIDOMHTMLSelectElement_GetSelectedIndex(This->nsselect, &idx); - if(NS_FAILED(nsres)) + nsres = nsIDOMHTMLSelectElement_GetSelectedIndex(This->nsselect, p); + if(NS_FAILED(nsres)) { ERR("GetSelectedIndex failed: %08x\n", nsres); + return E_FAIL; + } - *p = idx; return S_OK; }

1 0