November 2007 - Wine-commits

Lei Zhang : sane.ds: Get number of options only once.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: e984d7ba40e6d7e6de78a2cd4f88f0b3a2f4f087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e984d7ba40e6d7e6de78a2cd4… Author: Lei Zhang <thestig(a)google.com> Date: Fri Nov 9 01:38:23 2007 -0800 sane.ds: Get number of options only once. --- dlls/sane.ds/ui.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 18fd8de..6c877a2 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -370,10 +370,8 @@ static int create_item(HDC hdc, const SANE_Option_Descriptor *opt, static LPDLGTEMPLATEW create_options_page(HDC hdc, int *from_index, - BOOL split_tabs) + SANE_Int optcount, BOOL split_tabs) { - SANE_Status rc; - SANE_Int optcount; int i; INT y = 2; LPDLGTEMPLATEW tpl = NULL; @@ -385,15 +383,6 @@ static LPDLGTEMPLATEW create_options_page(HDC hdc, int *from_index, int group_offset = -1; INT control_count = 0; - rc = psane_control_option(activeDS.deviceHandle, 0, SANE_ACTION_GET_VALUE, - &optcount, NULL); - - if (rc != SANE_STATUS_GOOD) - { - ERR("Unable to read number of options\n"); - return NULL; - } - for (i = *from_index; i < optcount; i++) { LPDLGITEMTEMPLATEW item_tpl = NULL; @@ -540,12 +529,17 @@ BOOL DoScannerUI(void) memset(&psp,0,sizeof(psp)); rc = psane_control_option(activeDS.deviceHandle, 0, SANE_ACTION_GET_VALUE, &optcount, NULL); + if (rc != SANE_STATUS_GOOD) + { + ERR("Unable to read number of options\n"); + return FALSE; + } while (index < optcount) { const SANE_Option_Descriptor *opt; psp[page_count].u.pResource = create_options_page(hdc, &index, - TRUE); + optcount, TRUE); opt = psane_get_option_descriptor(activeDS.deviceHandle, index); if (opt->type == SANE_TYPE_GROUP)

1 0

Lei Zhang : sane.ds: Check return value from sane_control_option().
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 05907c3e29aed2684bf3879cd28ae2b47e8c29c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05907c3e29aed2684bf3879cd… Author: Lei Zhang <thestig(a)google.com> Date: Fri Nov 9 01:41:18 2007 -0800 sane.ds: Check return value from sane_control_option(). --- dlls/sane.ds/ui.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 6c877a2..0dff3e0 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -739,6 +739,11 @@ static INT_PTR InitializeDialog(HWND hwnd) rc = psane_control_option(activeDS.deviceHandle, 0, SANE_ACTION_GET_VALUE, &optcount, NULL); + if (rc != SANE_STATUS_GOOD) + { + ERR("Unable to read number of options\n"); + return FALSE; + } for ( i = 1; i < optcount; i++) {

1 0

Lei Zhang : sane.ds: Check return value from sane_get_option_descriptor().
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 84e8ea2fdcba6ea76f023e8bd584a78896066e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e8ea2fdcba6ea76f023e8bd… Author: Lei Zhang <thestig(a)google.com> Date: Fri Nov 9 01:53:07 2007 -0800 sane.ds: Check return value from sane_get_option_descriptor(). --- dlls/sane.ds/ui.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 0dff3e0..517f1fb 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -394,6 +394,8 @@ static LPDLGTEMPLATEW create_options_page(HDC hdc, int *from_index, int hold_for_group = 0; opt = psane_get_option_descriptor(activeDS.deviceHandle, i); + if (!opt) + continue; if (opt->type == SANE_TYPE_GROUP && split_tabs) { if (control_len > 0) @@ -407,6 +409,8 @@ static LPDLGTEMPLATEW create_options_page(HDC hdc, int *from_index, return NULL; } } + if (!SANE_OPTION_IS_ACTIVE (opt->cap)) + continue; len = create_item(hdc, opt, ID_BASE + i, &item_tpl, y, &x, &count);

1 0

Lei Zhang : sane.ds: Fix a memory leak.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 124f2aa27e45f4d6fe780ab172010fa27d8aa5cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=124f2aa27e45f4d6fe780ab17… Author: Lei Zhang <thestig(a)google.com> Date: Fri Nov 9 02:01:59 2007 -0800 sane.ds: Fix a memory leak. --- dlls/sane.ds/ui.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 517f1fb..6763240 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -597,6 +597,7 @@ BOOL DoScannerUI(void) HeapFree(GetProcessHeap(),0,(LPBYTE)psp[index].u.pResource); HeapFree(GetProcessHeap(),0,(LPBYTE)psp[index].pszTitle); } + HeapFree(GetProcessHeap(),0,szCaption); if (psrc == IDOK) return TRUE;

1 0

Lei Zhang : wininet: Skip strcmp() in a test if the returned value/ len is wrong.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 83a4dbaa689d54f12ce05011c9f41b7637f3b75b URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a4dbaa689d54f12ce05011c… Author: Lei Zhang <thestig(a)google.com> Date: Fri Nov 9 01:24:35 2007 -0800 wininet: Skip strcmp() in a test if the returned value/len is wrong. --- dlls/wininet/tests/internet.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 9fac11e..c441bf2 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -142,9 +142,12 @@ static void test_InternetQueryOptionA(void) buffer=HeapAlloc(GetProcessHeap(),0,len); retval=InternetQueryOptionA(hinet,INTERNET_OPTION_USER_AGENT,buffer,&len); err=GetLastError(); - todo_wine ok(!strcmp(useragent,buffer),"Got wrong user agent string %s instead of %s\n",buffer,useragent); - todo_wine ok(len == strlen(useragent),"Got wrong user agent length %d instead of %d\n",len,lstrlenA(useragent)); todo_wine ok(retval == 1,"Got wrong return value %d\n",retval); + if (retval) + { + todo_wine ok(!strcmp(useragent,buffer),"Got wrong user agent string %s instead of %s\n",buffer,useragent); + todo_wine ok(len == strlen(useragent),"Got wrong user agent length %d instead of %d\n",len,lstrlenA(useragent)); + } ok(err == 0xdeadbeef, "Got wrong error code %d\n",err); HeapFree(GetProcessHeap(),0,buffer);

1 0

EA Durbin : ntoskrnl.exe: Add stub Implementation of IoAllocateWorkItem.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: eb6a1fc9d0f128f5cf990cc5f79a34bb9f02be75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb6a1fc9d0f128f5cf990cc5f… Author: EA Durbin <ead1234(a)hotmail.com> Date: Thu Nov 8 15:09:08 2007 -0600 ntoskrnl.exe: Add stub Implementation of IoAllocateWorkItem. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4eec5f5..35d7db0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -249,6 +249,16 @@ NTSTATUS wine_ntoskrnl_main_loop( HANDLE stop_event ) /*********************************************************************** + * IoAllocateWorkItem (NTOSKRNL.EXE.@) + */ +PIO_WORKITEM WINAPI IoAllocateWorkItem( PDEVICE_OBJECT DeviceObject ) +{ + FIXME( "stub: %p \n", DeviceObject ); + return NULL; +} + + +/*********************************************************************** * IoCreateDevice (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 56cb407..689d0b3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -313,7 +313,7 @@ @ stub IoAllocateErrorLogEntry @ stub IoAllocateIrp @ stub IoAllocateMdl -@ stub IoAllocateWorkItem +@ stdcall IoAllocateWorkItem(ptr) @ stub IoAssignResources @ stub IoAttachDevice @ stub IoAttachDeviceByPointer diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index c78e2da..0e26ac2 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -88,6 +88,7 @@ typedef struct _IO_TIMER *PIO_TIMER; typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD; typedef struct _EPROCESS *PEPROCESS; +typedef struct _IO_WORKITEM *PIO_WORKITEM; #define MAXIMUM_VOLUME_LABEL_LENGTH (32 * sizeof(WCHAR))

1 0

EA Durbin : ntoskrnl.exe: Add stub Implementation of IoAllocateMdl.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 4bae34cd2e92601479a4ea6566f63f4e705557ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bae34cd2e92601479a4ea656… Author: EA Durbin <ead1234(a)hotmail.com> Date: Thu Nov 8 15:40:43 2007 -0600 ntoskrnl.exe: Add stub Implementation of IoAllocateMdl. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 35d7db0..2aac409 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -247,6 +247,15 @@ NTSTATUS wine_ntoskrnl_main_loop( HANDLE stop_event ) } } +/*********************************************************************** + * IoAllocateMdl (NTOSKRNL.EXE.@) + */ +PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN SecondaryBuffer, BOOLEAN ChargeQuota, PIRP Irp ) +{ + FIXME( "stub: %p, %u, %i, %i, %p \n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp ); + return NULL; +} + /*********************************************************************** * IoAllocateWorkItem (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 689d0b3..3117509 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -312,7 +312,7 @@ @ stub IoAllocateDriverObjectExtension @ stub IoAllocateErrorLogEntry @ stub IoAllocateIrp -@ stub IoAllocateMdl +@ stdcall IoAllocateMdl(ptr long long long ptr) @ stdcall IoAllocateWorkItem(ptr) @ stub IoAssignResources @ stub IoAttachDevice

1 0

Roderick Colenbrander : wined3d: Make sure the p8 shader is set to 0 after destroying the main render target .
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 33df806819ea9dd6ddc5799e2f1eedf76236ac52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33df806819ea9dd6ddc5799e2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Nov 8 22:51:01 2007 +0100 wined3d: Make sure the p8 shader is set to 0 after destroying the main render target. This fixes a render target recreation problem in Age of Empires II. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e9cd3de..ef6a0ea 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2163,6 +2163,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D /* Delete the palette conversion shader if it is around */ if(This->paletteConversionShader) { GL_EXTCALL(glDeleteProgramsARB(1, &This->paletteConversionShader)); + This->paletteConversionShader = 0; } /* Delete the pbuffer context if there is any */

1 0

Stefan Dösinger : wined3d: Actually store the PS' s vertex processing flag.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: 335bd99262ca71a1e7763bbb126737d8a4f5d551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=335bd99262ca71a1e7763bbb1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 8 23:41:59 2007 +0100 wined3d: Actually store the PS's vertex processing flag. --- dlls/wined3d/pixelshader.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 483c0ad..62a9fe6 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -361,18 +361,17 @@ static inline VOID IWineD3DPixelShaderImpl_GenerateShader( shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, &buffer, &GLINFO_LOCATION); /* Pack 3.0 inputs */ - if (This->baseShader.hex_version >= WINED3DPS_VERSION(3,0) && - !use_vs((IWineD3DDeviceImpl *) This->baseShader.device)) { + if (This->baseShader.hex_version >= WINED3DPS_VERSION(3,0)) { if(((IWineD3DDeviceImpl *) This->baseShader.device)->strided_streams.u.s.position_transformed) { This->vertexprocessing = pretransformed; + pshader_glsl_input_pack(&buffer, This->semantics_in, iface); } else if(!use_vs((IWineD3DDeviceImpl *) This->baseShader.device)) { This->vertexprocessing = fixedfunction; + pshader_glsl_input_pack(&buffer, This->semantics_in, iface); } else { This->vertexprocessing = vertexshader; } - - pshader_glsl_input_pack(&buffer, This->semantics_in, iface); } /* Base Shader Body */

1 0

Jacek Caban : mshtml: Added IDM_SETDIRTY implementation.
by Alexandre Julliard 09 Nov '07

09 Nov '07

Module: wine Branch: master Commit: a1e554739ee1a2e35bbb422d41c011bd551cbb2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e554739ee1a2e35bbb422d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 9 02:23:08 2007 +0100 mshtml: Added IDM_SETDIRTY implementation. --- dlls/mshtml/editor.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/olecmd.c | 7 ------- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 20db6ee..51f5f26 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -99,6 +99,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR wszFont[] = {'f','o','n','t',0}; static const WCHAR wszSize[] = {'s','i','z','e',0}; +static void set_dirty(HTMLDocument *This, VARIANT_BOOL dirty) +{ + nsresult nsres; + + if(!This->nscontainer || !This->nscontainer->editor) + return; + + if(dirty) { + nsres = nsIEditor_IncrementModificationCount(This->nscontainer->editor, 1); + if(NS_FAILED(nsres)) + ERR("IncrementModificationCount failed: %08x\n", nsres); + }else { + nsres = nsIEditor_ResetModificationCount(This->nscontainer->editor); + if(NS_FAILED(nsres)) + ERR("ResetModificationCount failed: %08x\n", nsres); + } +} + static void do_ns_editor_command(NSContainer *This, const char *cmd) { nsresult nsres; @@ -383,6 +401,8 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsISelection_Release(nsselection); nsIDOMDocument_Release(nsdoc); + + set_dirty(This, VARIANT_TRUE); } static void handle_arrow_key(HTMLDocument *This, nsIDOMKeyEvent *event, const char * const cmds[4]) @@ -949,6 +969,21 @@ HRESULT editor_exec_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VAR return S_OK; } +static HRESULT exec_setdirty(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); + + if(!in || This->usermode != EDITMODE) + return S_OK; + + if(V_VT(in) == VT_BOOL) + set_dirty(This, V_BOOL(in)); + else + FIXME("unsupported vt=%d\n", V_VT(in)); + + return S_OK; +} + static HRESULT query_edit_status(HTMLDocument *This, OLECMD *cmd) { switch(cmd->cmdID) { @@ -1247,6 +1282,7 @@ const cmdtable_t editmode_cmds[] = { {IDM_OUTDENT, query_edit_status, exec_outdent}, {IDM_COMPOSESETTINGS, NULL, exec_composesettings}, {IDM_HYPERLINK, query_edit_status, exec_hyperlink}, + {IDM_SETDIRTY, NULL, exec_setdirty}, {0,NULL,NULL} }; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 96cccae..b76ea31 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -626,12 +626,6 @@ static HRESULT exec_htmleditmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT * return S_OK; } -static HRESULT exec_setdirty(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) -{ - FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); - return E_NOTIMPL; -} - static HRESULT exec_baselinefont3(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); @@ -718,7 +712,6 @@ static const cmdtable_t base_cmds[] = { {IDM_BROWSEMODE, NULL, exec_browsemode}, {IDM_EDITMODE, NULL, exec_editmode}, {IDM_PRINT, query_enabled_stub, exec_print}, - {IDM_SETDIRTY, NULL, exec_setdirty}, {IDM_HTMLEDITMODE, NULL, exec_htmleditmode}, {IDM_BASELINEFONT3, NULL, exec_baselinefont3}, {IDM_BLOCKDIRLTR, query_enabled_stub, NULL},

1 0