wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

James Hawkins : msi: Use a different separator as a semi-colon may separate values in the CustomActionData .
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 6af199ef9c4e25e3521f8ad3b109a0ab43edebae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af199ef9c4e25e3521f8ad3b… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 24 15:54:36 2007 -0700 msi: Use a different separator as a semi-colon may separate values in the CustomActionData. --- dlls/msi/custom.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 06699d2..cc08c29 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -137,7 +137,7 @@ static BOOL check_execution_scheduling_options(MSIPACKAGE *package, LPCWSTR acti /* stores the following properties before the action: * - * [CustomActionData;UserSID;ProductCode]Action + * [CustomActionData][UserSID][ProductCode]Action */ static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata, LPCWSTR usersid, LPCWSTR prodcode) @@ -145,7 +145,7 @@ static LPWSTR msi_get_deferred_action(LPCWSTR action, LPCWSTR actiondata, LPWSTR deferred; DWORD len; - static const WCHAR format[] = {'[','%','s',';','%','s',';','%','s',']','%','s',0}; + static const WCHAR format[] = {'[','%','s',']','[','%','s',']','[','%','s',']','%','s',0}; if (!actiondata) return strdupW(action); @@ -162,15 +162,15 @@ static void set_deferred_action_props(MSIPACKAGE *package, LPWSTR deferred_data) { LPWSTR end, beg = deferred_data + 1; - end = strchrW(beg, ';'); + end = strchrW(beg, ']'); *end = '\0'; MSI_SetPropertyW(package, szActionData, beg); - beg = end + 1; + beg = end + 2; - end = strchrW(beg, ';'); + end = strchrW(beg, ']'); *end = '\0'; MSI_SetPropertyW(package, UserSID, beg); - beg = end + 1; + beg = end + 2; end = strchrW(beg, ']'); *end = '\0'; @@ -193,7 +193,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL WCHAR *deformated=NULL; /* deferred action: [properties]Action */ - if ((ptr = strchrW(action_copy, ']'))) + if ((ptr = strrchrW(action_copy, ']'))) { deferred_data = action_copy; action = ptr + 1;

1 0

Jason Edmeades : cmd: Fix trap when batch pgm runs another batch pgm.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 85c5dcb13f98f2d403d9c9ea80ef8b50b37365b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c5dcb13f98f2d403d9c9ea8… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Tue Jul 24 23:36:30 2007 +0100 cmd: Fix trap when batch pgm runs another batch pgm. --- programs/cmd/batch.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 8f0187c..8faa297 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -122,13 +122,10 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN LocalFree ((HANDLE)context); if ((prev_context != NULL) && (!called)) { - CloseHandle (prev_context -> h); - context = prev_context -> prev_context; - LocalFree ((HANDLE)prev_context); - } - else { + prev_context -> skip_rest = TRUE; context = prev_context; } + context = prev_context; } /*******************************************************************

1 0

Rob Shearman : mshtml: Events are reset when a new document URI is loaded, so re-initialise them in start_binding.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: addc9957afa5091d0a563c8d7ffea379bfdac7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addc9957afa5091d0a563c8d7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jul 24 17:07:10 2007 -0500 mshtml: Events are reset when a new document URI is loaded, so re-initialise them in start_binding. --- dlls/mshtml/navigate.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3e05fdc..76fd5f2 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -815,6 +815,11 @@ HRESULT start_binding(BSCallback *bscallback) IMoniker_Release(bscallback->mon); bscallback->mon = NULL; + + /* events are reset when a new document URI is loaded, so re-initialise them here */ + if(bscallback->doc && bscallback->doc->nscontainer) + init_nsevents(bscallback->doc->nscontainer); + return S_OK; }

1 0

Rob Shearman : mshtml: Set focus to the Gecko window in OleInPlaceActiveObject_OnFrameWindowActivate .
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: fbdc76aaf7a1ff6693a0837f7c294cc3de0cb26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdc76aaf7a1ff6693a0837f7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jul 24 17:07:05 2007 -0500 mshtml: Set focus to the Gecko window in OleInPlaceActiveObject_OnFrameWindowActivate. --- dlls/mshtml/olewnd.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index 5ce3209..613f71d 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -101,6 +101,9 @@ static HRESULT WINAPI OleInPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceAc if(This->hostui) IDocHostUIHandler_OnFrameWindowActivate(This->hostui, fActivate); + if(fActivate && This->nscontainer) + nsIWebBrowserFocus_Activate(This->nscontainer->focus); + return S_OK; }

1 0

Rob Shearman : mshtml: Call IDocHostUIHandler_HideUI and IDocHostUIHandler_ShowUI when changing an UI active window to be in edit mode .
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: bbb03cf16bc86749f2b9e876204f2485d31e5dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb03cf16bc86749f2b9e8762… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jul 24 17:06:56 2007 -0500 mshtml: Call IDocHostUIHandler_HideUI and IDocHostUIHandler_ShowUI when changing an UI active window to be in edit mode. Add tests for the behaviour of changing edit mode when a UI window is active. --- dlls/mshtml/editor.c | 29 +++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/tests/htmldoc.c | 53 ++++++++++++++++++++++++++++++++++++++---- 4 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 2a02567..f9005b6 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -34,6 +34,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -570,6 +571,34 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) nsIDOMKeyEvent_Release(key_event); } +void handle_edit_load(HTMLDocument *This) +{ + This->nscontainer->editor_controller = get_editor_controller(This->nscontainer); + + if(This->ui_active) { + OLECHAR wszHTMLDocument[30]; + RECT rcBorderWidths; + + if(This->ip_window) + IOleInPlaceUIWindow_SetActiveObject(This->ip_window, NULL, NULL); + if(This->hostui) + IDocHostUIHandler_HideUI(This->hostui); + + if(This->hostui) + IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This), + This->frame, This->ip_window); + + LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument, + sizeof(wszHTMLDocument)/sizeof(WCHAR)); + + if(This->ip_window) + IOleInPlaceUIWindow_SetActiveObject(This->ip_window, ACTOBJ(This), wszHTMLDocument); + + memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); + IOleInPlaceFrame_SetBorderSpace(This->frame, &rcBorderWidths); + } +} + static void set_ns_fontname(NSContainer *This, const char *fontname) { nsICommandParams *nsparam = create_nscommand_params(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f45f90a..27f9ba7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -442,6 +442,7 @@ void handle_edit_event(HTMLDocument*,nsIDOMEvent*); HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_paste(HTMLDocument*,DWORD,VARIANT*,VARIANT*); +void handle_edit_load(HTMLDocument *This); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 255716c..f03b731 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -142,7 +142,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event } if(This->doc->usermode == EDITMODE) - This->editor_controller = get_editor_controller(This); + handle_edit_load(This->doc); task = mshtml_alloc(sizeof(task_t)); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 38d3290..5306d84 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -130,7 +130,7 @@ DEFINE_EXPECT(InPlaceUIWindow_SetActiveObject); static IUnknown *doc_unk; static BOOL expect_LockContainer_fLock; -static BOOL expect_SetActiveObject_active, expect_InPlaceUIWindow_SetActiveObject_active; +static BOOL expect_SetActiveObject_active, expect_InPlaceUIWindow_SetActiveObject_active = TRUE; static BOOL ipsex; static BOOL set_clientsite = FALSE, container_locked = FALSE; static BOOL readystate_set_loading = FALSE, load_from_stream; @@ -1139,6 +1139,7 @@ static HRESULT WINAPI InPlaceUIWindow_SetActiveObject(IOleInPlaceFrame *iface, ok(pActiveObject == NULL, "pActiveObject=%p, expected NULL\n", pActiveObject); ok(pszObjName == NULL, "pszObjName=%p, expected NULL\n", pszObjName); } + expect_InPlaceUIWindow_SetActiveObject_active = !expect_InPlaceUIWindow_SetActiveObject_active; return S_OK; } @@ -1778,7 +1779,10 @@ static HRESULT WINAPI DocHostUIHandler_ShowUI(IDocHostUIHandler2 *iface, DWORD d { CHECK_EXPECT(ShowUI); - ok(dwID == DOCHOSTUITYPE_BROWSE, "dwID=%d, expected DOCHOSTUITYPE_BROWSE\n", dwID); + if (editmode) + ok(dwID == DOCHOSTUITYPE_AUTHOR, "dwID=%d, expected DOCHOSTUITYPE_AUTHOR\n", dwID); + else + ok(dwID == DOCHOSTUITYPE_BROWSE, "dwID=%d, expected DOCHOSTUITYPE_BROWSE\n", dwID); ok(pActiveObject != NULL, "pActiveObject = NULL\n"); ok(pCommandTarget != NULL, "pCommandTarget = NULL\n"); ok(pFrame == &InPlaceFrame, "pFrame=%p, expected %p\n", pFrame, &InPlaceFrame); @@ -2862,6 +2866,10 @@ static void test_exec_editmode(IUnknown *unk) SET_EXPECT(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); SET_EXPECT(OnChanged_READYSTATE); + SET_EXPECT(InPlaceUIWindow_SetActiveObject); + SET_EXPECT(HideUI); + SET_EXPECT(ShowUI); + SET_EXPECT(InPlaceFrame_SetBorderSpace); expect_status_text = NULL; readystate_set_loading = TRUE; @@ -2875,6 +2883,10 @@ static void test_exec_editmode(IUnknown *unk) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); CHECK_CALLED(OnChanged_READYSTATE); + CHECK_CALLED(InPlaceUIWindow_SetActiveObject); + CHECK_CALLED(HideUI); + CHECK_CALLED(ShowUI); + CHECK_CALLED(InPlaceFrame_SetBorderSpace); test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE); @@ -3300,7 +3312,6 @@ static HRESULT test_Activate(IUnknown *unk, DWORD flags) SET_EXPECT(ShowUI); SET_EXPECT(InPlaceUIWindow_SetActiveObject); SET_EXPECT(InPlaceFrame_SetBorderSpace); - expect_InPlaceUIWindow_SetActiveObject_active = TRUE; expect_SetActiveObject_active = TRUE; expect_status_text = NULL; @@ -3383,7 +3394,6 @@ static void test_UIDeactivate(void) } expect_SetActiveObject_active = FALSE; - expect_InPlaceUIWindow_SetActiveObject_active = FALSE; hres = IOleDocumentView_UIActivate(view, FALSE); ok(hres == S_OK, "UIActivate failed: %08x\n", hres); @@ -3686,6 +3696,34 @@ static void test_HTMLDocument_StreamLoad(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } +static void test_edit_uiactivate(IOleObject *oleobj) +{ + IOleDocumentView *docview; + HRESULT hres; + + hres = IOleObject_QueryInterface(oleobj, &IID_IOleDocumentView, (void **)&docview); + ok(hres == S_OK, "IOleObject_QueryInterface failed with error 0x%08x\n", hres); + + SET_EXPECT(OnFocus_TRUE); + SET_EXPECT(SetActiveObject); + SET_EXPECT(ShowUI); + SET_EXPECT(InPlaceUIWindow_SetActiveObject); + SET_EXPECT(InPlaceFrame_SetBorderSpace); + expect_SetActiveObject_active = TRUE; + expect_status_text = NULL; + + hres = IOleDocumentView_UIActivate(docview, TRUE); + ok(hres == S_OK, "IOleDocumentView_UIActivate failed with error 0x%08x\n", hres); + + CHECK_CALLED(OnFocus_TRUE); + CHECK_CALLED(SetActiveObject); + CHECK_CALLED(ShowUI); + CHECK_CALLED(InPlaceUIWindow_SetActiveObject); + CHECK_CALLED(InPlaceFrame_SetBorderSpace); + + IOleDocumentView_Release(docview); +} + static void test_editing_mode(void) { IUnknown *unk; @@ -3696,6 +3734,7 @@ static void test_editing_mode(void) trace("Testing HTMLDocument (edit)...\n"); init_test(LD_DOLOAD); + call_UIActivate = CallUIActivate_AfterShow; hres = create_document(&unk); if(FAILED(hres)) @@ -3709,11 +3748,15 @@ static void test_editing_mode(void) test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); + test_edit_uiactivate(oleobj); + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_exec_editmode(unk); + test_UIDeactivate(); + call_UIActivate = CallUIActivate_None; IOleObject_Release(oleobj); - test_exec_editmode(unk); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_download(TRUE, FALSE); test_timer(EXPECT_UPDATEUI);

1 0

Rob Shearman : mshtml: Pass the correct DOCHOSTUITYPE value to IDocHostUIHandler_ShowUI.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 9a67e1ffe536c7c65f4a028ac03ae4c22bcb8593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a67e1ffe536c7c65f4a028ac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jul 24 17:06:47 2007 -0500 mshtml: Pass the correct DOCHOSTUITYPE value to IDocHostUIHandler_ShowUI. Don't reset window_active in OleDocumentView_UIActivate. --- dlls/mshtml/view.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index c79da80..a201de0 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -596,8 +596,9 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f return hres; } - hres = IDocHostUIHandler_ShowUI(This->hostui, 0, ACTOBJ(This), CMDTARGET(This), - This->frame, This->ip_window); + hres = IDocHostUIHandler_ShowUI(This->hostui, + This->usermode == EDITMODE ? DOCHOSTUITYPE_AUTHOR : DOCHOSTUITYPE_BROWSE, + ACTOBJ(This), CMDTARGET(This), This->frame, This->ip_window); if(FAILED(hres)) IDocHostUIHandler_HideUI(This->hostui); @@ -609,7 +610,6 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f This->ui_active = TRUE; }else { - This->window_active = FALSE; if(This->ui_active) { This->ui_active = FALSE; if(This->ip_window)

1 0

Rob Shearman : mshtml: OleDocumentView_UIActivate should call IOleInPlaceUIWindow_SetActiveObject and IOleInPlaceFrame_SetBorderSpace .
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 92b3cab7916445d79d2559e4b580f99e3b0de479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b3cab7916445d79d2559e4b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jul 24 17:06:42 2007 -0500 mshtml: OleDocumentView_UIActivate should call IOleInPlaceUIWindow_SetActiveObject and IOleInPlaceFrame_SetBorderSpace. Add a test to show this behaviour. Don't call nsIWebBrowserFocus_Activate when just activating the window. Instead call it when UI-activating the window. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/htmldoc.c | 99 ++++++++++++++++++++++++++++++++++++------ dlls/mshtml/view.c | 39 ++++++++++++----- 3 files changed, 114 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92b3cab7916445d79d255…

1 0

H. Verbeet : wined3d: Fix the stretch_rect_fbo() declaration to match the implementation.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: d7c7cbf6b63769e6de9889b51adccc7be61e2ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7c7cbf6b63769e6de9889b51… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 24 23:38:40 2007 +0200 wined3d: Fix the stretch_rect_fbo() declaration to match the implementation. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d735bb5..7743051 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2057,6 +2057,6 @@ static inline BOOL use_ps(IWineD3DDeviceImpl *device) { } void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect, - IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, WINED3DTEXTUREFILTERTYPE filter, BOOL flip); + IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip); #endif

1 0

H. Verbeet : wined3d: Pass the correct target to glMultiTexCoord.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: e652128fdf7655365a920d389e85321a0387c750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e652128fdf7655365a920d389… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jul 24 23:38:31 2007 +0200 wined3d: Pass the correct target to glMultiTexCoord. --- dlls/wined3d/drawprim.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 721d913..1d0c0d3 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -458,7 +458,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData case WINED3DTTFF_COUNT1: VTRACE(("tex:%d, s=%f\n", textureNo, s)); if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord1fARB(texture_idx, s)); + GL_EXTCALL(glMultiTexCoord1fARB(GL_TEXTURE0_ARB + texture_idx, s)); } else { glTexCoord1f(s); } @@ -466,7 +466,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData case WINED3DTTFF_COUNT2: VTRACE(("tex:%d, s=%f, t=%f\n", textureNo, s, t)); if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord2fARB(texture_idx, s, t)); + GL_EXTCALL(glMultiTexCoord2fARB(GL_TEXTURE0_ARB + texture_idx, s, t)); } else { glTexCoord2f(s, t); } @@ -474,7 +474,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData case WINED3DTTFF_COUNT3: VTRACE(("tex:%d, s=%f, t=%f, r=%f\n", textureNo, s, t, r)); if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord3fARB(texture_idx, s, t, r)); + GL_EXTCALL(glMultiTexCoord3fARB(GL_TEXTURE0_ARB + texture_idx, s, t, r)); } else { glTexCoord3f(s, t, r); } @@ -482,7 +482,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData case WINED3DTTFF_COUNT4: VTRACE(("tex:%d, s=%f, t=%f, r=%f, q=%f\n", textureNo, s, t, r, q)); if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord4fARB(texture_idx, s, t, r, q)); + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + texture_idx, s, t, r, q)); } else { glTexCoord4f(s, t, r, q); }

1 0

Michael Stefaniuc : wined3d: Remove a return after a return. Found by Smatch.
by Alexandre Julliard 25 Jul '07

25 Jul '07

Module: wine Branch: master Commit: 25707d4c5dd2ecea573f804ff6a42188e52d8e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25707d4c5dd2ecea573f804ff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 24 22:29:16 2007 +0200 wined3d: Remove a return after a return. Found by Smatch. --- dlls/wined3d/surface.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 07467be..11e0fba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3152,7 +3152,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT * { IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; - if (Flags & WINEDDBLT_DEPTHFILL) { + if (Flags & WINEDDBLT_DEPTHFILL) return IWineD3DDevice_Clear((IWineD3DDevice *) myDevice, DestRect == NULL ? 0 : 1, (WINED3DRECT *) DestRect, @@ -3161,9 +3161,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT * (float) DDBltFx->u5.dwFillDepth / (float) MAXDWORD, 0x00000000); - return WINED3D_OK; - } - FIXME("(%p): Unsupp depthstencil blit\n", This); return WINED3DERR_INVALIDCALL; }

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
96
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 July 2007