January 2008 - Wine-Commits

Aric Stewart : fonts: Add Japanese small font.
by Alexandre Julliard Jan. 11, 2008

Jan. 11, 2008

Module: wine Branch: master Commit: 0904e34906ccc3c76f8ea2e99faade9dd2feba20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0904e34906ccc3c76f8ea2e99… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 10 08:01:14 2008 -0600 fonts: Add Japanese small font. --- fonts/.gitignore | 1 + fonts/Makefile.in | 6 +- fonts/small_fonts_jp.sfd | 1637 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1641 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0904e34906ccc3c76f8ea…

1 0

Alexander Nicolaysen Sørnes : Fix bug link on queued items page
by Chris Morgan Jan. 11, 2008

Jan. 11, 2008

Module: appdb Branch: master Commit: 907ce1c928da833af007b5764b879700a108eb34 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=907ce1c928da833af007b576… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Jan 11 01:54:17 2008 +0100 Fix bug link on queued items page --- include/bugs.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index b1d7506..13b1404 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -315,7 +315,7 @@ class Bug $oTableRow = new TableRow(); $oTableRow->AddTextCell(version::fullNameLink($oRow->versionId)); - $oTableRow->AddTextCell('<a href='.BUGZILLA_ROOT.'show_bug.cgi?id='.$oRow->bug_id.'">'.$oRow->bug_id.'</a>'); + $oTableRow->AddTextCell('<a href="'.BUGZILLA_ROOT.'show_bug.cgi?id='.$oRow->bug_id.'">'.$oRow->bug_id.'</a>'); $oTableRow->AddTextCell($oBug->sBug_status); $oTableRow->AddTextCell($oBug->sResolution); $oTableRow->AddTextCell($oBug->sShort_desc);

1 0

Alexander Nicolaysen Sørnes : objectManager: Handle sState in URLs
by Chris Morgan Jan. 11, 2008

Jan. 11, 2008

Module: appdb Branch: master Commit: f04c6fe4dc44eaf504d38f3a7af4415541297b77 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f04c6fe4dc44eaf504d38f3a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 6 01:14:56 2008 +0100 objectManager: Handle sState in URLs --- include/objectManager.php | 14 +++++++++++++- include/sidebar.php | 8 ++++---- include/sidebar_admin.php | 40 ++++++++++++++++++++-------------------- objectManager.php | 4 +++- 4 files changed, 40 insertions(+), 26 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index e296b1d..05b1d5c 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -65,7 +65,19 @@ class ObjectManager public function setState($sState) { - $this->sState = $sState; + /* Ensure that the given state is valid */ + switch($sState) + { + case 'accepted': + case 'queued': + case 'rejected': + case 'deleted': + $this->sState = $sState; + return true; + + default: + return false; + } } public function getIsQueue() diff --git a/include/sidebar.php b/include/sidebar.php index ac060ec..dc748cf 100644 --- a/include/sidebar.php +++ b/include/sidebar.php @@ -21,7 +21,7 @@ function global_sidebar_menu() $g->add("Screenshots", BASE."objectManager.php?sClass=screenshot&sTitle=View+Screenshots"); $g->add("Browse Apps", BASE."appbrowse.php"); $g->add("Browse Newest Apps", BASE."objectManager.php?sClass=application&". - "bIsQueue=false&sTitle=Newest%20apps&sOrderBy=appId&bAscending=false"); + 'sTitle=Newest%20apps&sOrderBy=appId&bAscending=false'); $g->add("Downloadable Apps", BASE."browse_downloadable.php"); $g->add("Browse Apps by Rating", BASE."browse_by_rating.php"); $g->add("Top 25", BASE."votestats.php"); @@ -29,10 +29,10 @@ function global_sidebar_menu() "sTitle=Submit+Application&sAction=add"); $g->add("Help & Documentation", BASE."help/"); $g->add("Statistics", BASE."appdbStats.php"); - $g->add("Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=distribution&bIsQueue=false&sTitle=View%20Distributions"); - $g->add("Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE."objectManager.php?sClass=vendor&bIsQueue=false&sTitle=View%20Vendors"); + $g->add("Distributions (".distribution::objectGetEntriesCount(false, false).")", BASE.'objectManager.php?sClass=distribution&sTitle=View%20Distributions'); + $g->add("Vendors (".vendor::objectGetEntriesCount(false, false).")", BASE.'objectManager.php?sClass=vendor&sTitle=View%20Vendors'); $g->add("Email your suggestions for improving the AppDB", "mailto:appdb(a)winehq.org"); - $g->done(); + $g->done(); $g = new htmlmenu("Search"); $g->addmisc(app_search_box(!empty($aClean['sSearchQuery']) ? $aClean['sSearchQuery'] : '')); diff --git a/include/sidebar_admin.php b/include/sidebar_admin.php index 0ee3db5..bc1fdb4 100644 --- a/include/sidebar_admin.php +++ b/include/sidebar_admin.php @@ -10,34 +10,34 @@ function global_admin_menu() { $g = new htmlmenu("Global Admin"); $g->add("App Queue (".application::objectGetEntriesCount(true, false).")", - BASE."objectManager.php?sClass=application_queue&bIsQueue=true&sTitle=". - "Application%20Queue"); + BASE.'objectManager.php?sClass=application_queue&sState=queued&sTitle='. + 'Application%20Queue'); $g->add("Version Queue (".version::objectGetEntriesCount(true, false).")", - BASE."objectManager.php?sClass=version_queue&bIsQueue=true&sTitle=". - "Version%20Queue"); + BASE.'objectManager.php?sClass=version_queue&sState=queued&sTitle='. + 'Version%20Queue'); $g->add("Screenshot Queue (".appData::objectGetEntriesCount("true", false, "screenshot").")", - BASE."objectManager.php?sClass=screenshot&bIsQueue=true&sTitle=". - "Screenshot%20Queue"); + BASE.'objectManager.php?sClass=screenshot&sState=queued&sTitle='. + 'Screenshot%20Queue'); $g->add("Maintainer Queue (".Maintainer::objectGetEntriesCount(true, false).")", - BASE."objectManager.php?sClass=maintainer&bIsQueue=true&sTitle=". - "Maintainer%20Queue"); + BASE.'objectManager.php?sClass=maintainer&sState=queued&sTitle='. + 'Maintainer%20Queue'); $g->add("Test Results Queue (".testData::objectGetEntriesCount(true, false).")", - BASE."objectManager.php?sClass=testData_queue&bIsQueue=true&sTitle=". - "Test%20Results%20Queue"); + BASE.'objectManager.php?sClass=testData_queue&sState=queued&sTitle='. + 'Test%20Results%20Queue'); $g->add("Bug Link Queue (".bug::objectGetEntriesCount(true, false).")", - BASE."objectManager.php?sClass=bug&bIsQueue=true&sTitle=". - "Bug%20Link%20Queue"); + BASE.'objectManager.php?sClass=bug&sState=queued&sTitle='. + 'Bug%20Link%20Queue'); $g->addmisc(" "); $g->add("Maintainer Entries (".Maintainer::getMaintainerCount().")", BASE."admin/adminMaintainers.php"); $g->add("Bug Links (".bug::objectGetEntriesCount(false, false).")", - BASE."objectManager.php?sClass=bug&bIsQueue=false&sTitle=". + BASE."objectManager.php?sClass=bug&sTitle=". "Bug%20Links"); $g->add("Test Results (".testData::objectGetEntriesCount(false, false).")", - BASE."objectManager.php?sClass=testData&bIsQueue=false&sTitle=". + BASE."objectManager.php?sClass=testData&sTitle=". "View%20Test%20Results"); $g->add("Users Management", BASE."admin/adminUsers.php"); $g->add("Comments Management", BASE."admin/adminCommentView.php"); @@ -47,15 +47,15 @@ function global_admin_menu() { $g->add("Rejected Applications (".application::objectGetEntriesCount(true, true).")", - BASE."objectManager.php?sClass=application_queue&bIsQueue=true&bIsRejected=". - "true&sTitle=Rejected%20Applications"); + BASE.'objectManager.php?sClass=application_queue&sState=rejected&'. + 'sTitle=Rejected%20Applications'); $g->add("Rejected Versions (".version::objectGetEntriesCount(true, true).")", - BASE."objectManager.php?sClass=version_queue&bIsQueue=true&". - "bIsRejected=true&sTitle=Rejected%20Versions"); + BASE.'objectManager.php?sClass=version_queue&sState=rejected&'. + 'sTitle=Rejected%20Versions'); $g->add("Rejected Test Results (".testData::objectGetEntriesCount(true, true).")", - BASE."objectManager.php?sClass=testData_queue&bIsQueue=true". - "&bIsRejected=true&sTitle=Rejected%20Test%20Results"); + BASE.'objectManager.php?sClass=testData_queue&sState=rejected&'. + 'sTitle=Rejected%20Test%20Results'); $g->addmisc(" "); diff --git a/objectManager.php b/objectManager.php index 8be8181..29fb539 100644 --- a/objectManager.php +++ b/objectManager.php @@ -42,7 +42,9 @@ $aClean['iId'] = isset($aClean['iId']) ? $aClean['iId'] : 0; $oObject = new objectManager($aClean['sClass'], $aClean['sTitle'], $aClean['iId']); -if(getInput('bIsRejected', $aClean) == 'true') +if(getInput('sState', $aClean)) + $oObject->setState($aClean['sState']); +else if(getInput('bIsRejected', $aClean) == 'true') // Compatibility with old URLs $oObject->setState('rejected'); else if(getInput('bIsQueue', $aClean) == 'true') $oObject->setState('queued');

1 0

Jeremy Newman : fix bugs by my link as suggested in bug 9285
by Jeremy Newman Jan. 10, 2008

Jan. 10, 2008

Module: bugzilla Branch: master Commit: 4ce1376160a2cf59767b191ff3009cfda2f66fbc URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4ce1376160a2cf59767b1… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 10 09:27:24 2008 -0600 fix bugs by my link as suggested in bug 9285 --- template/en/default/global/sidebar.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index e37ecd2..15ec5bd 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -55,7 +55,7 @@ [%+ terms.Bugs %]</a> </td></tr> <tr class="sideMenu"><td> - <a href="buglist.cgi?email1=[% user.email FILTER html %]&emailtype1=exact&emailreporter1=1" + <a href="buglist.cgi?email1=[% user.email FILTER url_quote %]&emailtype1=exact&emailreporter1=1" class="menuItem">Bugs by Me</a> </td></tr> [% print_pipe = 1 %]

1 0

Andrey Turkin : wineboot: Fix installation of SFP protected files.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: d43f025b8c0fe5bb1e7bd0352f8eb7227a819ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d43f025b8c0fe5bb1e7bd0352… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Thu Jan 10 15:19:38 2008 +0300 wineboot: Fix installation of SFP protected files. --- programs/wineboot/wineboot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index da0eb79..843bfaa 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -495,6 +495,7 @@ static int ProcessWindowsFileProtection(void) } find_handle = FindFirstFileW(dllcache,&finddata); + dllcache[ strlenW(dllcache) - 2] = 0; /* strip off wildcard */ find_rc = find_handle != INVALID_HANDLE_VALUE; while (find_rc) {

1 0

Jacek Caban : mshtml: Don' t crash in before_async_open if there is no client site.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: 7de847c6eededa1bdc1c61068c0ab54d5c3160e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de847c6eededa1bdc1c61068… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 10 12:53:14 2008 +0100 mshtml: Don't crash in before_async_open if there is no client site. --- dlls/mshtml/nsio.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 2568b35..cc4ea2f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -116,6 +116,9 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) doc = container_iter->doc; } + if(!doc->client) + return TRUE; + if(!hlnf && !exec_shldocvw_67(doc, uri)) return FALSE;

1 0

Jacek Caban : mshtml: Handle fClearDirty flag in IPersistStreamInit::Save.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: c58ca1312cbb9298a22736e6e9c82e2413017c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58ca1312cbb9298a22736e6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 10 12:53:38 2008 +0100 mshtml: Handle fClearDirty flag in IPersistStreamInit::Save. --- dlls/mshtml/editor.c | 6 +++--- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/persist.c | 7 +++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index aaf4a04..00a3ba1 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -99,11 +99,11 @@ 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) +void set_dirty(HTMLDocument *This, VARIANT_BOOL dirty) { nsresult nsres; - if(!This->nscontainer || !This->nscontainer->editor) + if(This->usermode != EDITMODE || !This->nscontainer || !This->nscontainer->editor) return; if(dirty) { @@ -976,7 +976,7 @@ static HRESULT exec_setdirty(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, { TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); - if(!in || This->usermode != EDITMODE) + if(!in) return S_OK; if(V_VT(in) == VT_BOOL) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c981348..e2abfa4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -490,8 +490,9 @@ 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); +void handle_edit_load(HTMLDocument*); HRESULT editor_is_dirty(HTMLDocument*); +void set_dirty(HTMLDocument*,VARIANT_BOOL); extern DWORD mshtml_tls; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 033ce7e..38b4cef 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -705,18 +705,21 @@ static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM DWORD len, written=0; HRESULT hres; - WARN("(%p)->(%p %x) needs more work\n", This, pStm, fClearDirty); + TRACE("(%p)->(%p %x)\n", This, pStm, fClearDirty); hres = get_doc_string(This, &str, &len); if(FAILED(hres)) return hres; - hres = IStream_Write(pStm, str, len, &written); if(FAILED(hres)) FIXME("Write failed: %08x\n", hres); heap_free(str); + + if(fClearDirty) + set_dirty(This, VARIANT_FALSE); + return S_OK; }

1 0

Austin English : Spelling fixes.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: 65569206b2262f4c897943c19d0b5f11cfa21e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=65569206b2262f4c897943c19… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 9 11:59:19 2008 -0600 Spelling fixes. --- dlls/winedos/dma.c | 2 +- dlls/winedos/dosmem.c | 4 ++-- dlls/winedos/int10.c | 6 +++--- dlls/winedos/soundblaster.c | 2 +- dlls/winedos/vxd.c | 6 +++--- dlls/wineesd.drv/audio.c | 4 ++-- dlls/winejoystick.drv/joystick.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winedos/dma.c b/dlls/winedos/dma.c index d087892..c356ac9 100644 --- a/dlls/winedos/dma.c +++ b/dlls/winedos/dma.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dma); -/* Internal registers of the 2 DMA chips wich control 8 DMA channels */ +/* Internal registers of the 2 DMA chips which control 8 DMA channels */ static DWORD DMA_BaseAddress[8]; static WORD DMA_ByteCount[8]; static DWORD DMA_CurrentBaseAddress[8]; diff --git a/dlls/winedos/dosmem.c b/dlls/winedos/dosmem.c index 2c3c2ca..3f635c7 100644 --- a/dlls/winedos/dosmem.c +++ b/dlls/winedos/dosmem.c @@ -234,7 +234,7 @@ void BiosTick( WORD timer ) * DOSMEM_Collapse * * Helper function for internal use only. - * Atach all following free blocks to this one, even if this one is not free. + * Attach all following free blocks to this one, even if this one is not free. */ static void DOSMEM_Collapse( MCB* mcb ) { @@ -285,7 +285,7 @@ LPVOID DOSMEM_AllocBlock(UINT size, UINT16* pseg) if (curr->psp == MCB_PSP_FREE) { DOSMEM_Collapse( curr ); - /* is it large enough (one paragaph for the MCB)? */ + /* is it large enough (one paragraph for the MCB)? */ if (curr->size >= size) { if (curr->size > size) diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c index f0de570..a056cb6 100644 --- a/dlls/winedos/int10.c +++ b/dlls/winedos/int10.c @@ -927,7 +927,7 @@ static void INT10_HandleVESA( CONTEXT86 *context ) case 0x05: /* VESA SuperVGA BIOS - CPU VIDEO MEMORY CONTROL */ /* * This subfunction supports only Window A (BL_reg == 0) and - * is assumes that window granularity is 64k. + * it assumes that window granularity is 64k. */ switch(BH_reg(context)) { case 0x00: /* select video memory window */ @@ -1386,7 +1386,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT86 *context ) case 0x20: /* ALTERNATE PRTSC */ FIXME("Install Alternate Print Screen - Not Supported\n"); break; - case 0x30: /* SELECT VERTICAL RESOULTION */ + case 0x30: /* SELECT VERTICAL RESOLUTION */ FIXME("Select vertical resolution - not supported\n"); break; case 0x31: /* ENABLE/DISABLE DEFAULT PALETTE LOADING */ @@ -1395,7 +1395,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT86 *context ) (data->VGASettings & 0xf7) | ((AL_reg(context) == 1) << 3); break; - case 0x32: /* ENABLE/DISABLE VIDEO ADDRERSSING */ + case 0x32: /* ENABLE/DISABLE VIDEO ADDRESSING */ FIXME("Video Addressing - Not Supported\n"); break; case 0x33: /* ENABLE/DISABLE GRAY SCALE SUMMING */ diff --git a/dlls/winedos/soundblaster.c b/dlls/winedos/soundblaster.c index 07fc72f..e48095f 100644 --- a/dlls/winedos/soundblaster.c +++ b/dlls/winedos/soundblaster.c @@ -220,7 +220,7 @@ static void SB_Reset(void) /* All right, let's put the magic value for autodetection */ DSP_OutBuffer[0] = 0xaa; else - /* Something is wrong, put 0 to failed audetection */ + /* Something is wrong, put 0 to failed autodetection */ DSP_OutBuffer[0] = 0x00; } diff --git a/dlls/winedos/vxd.c b/dlls/winedos/vxd.c index 18ca0d4..4a1eabf 100644 --- a/dlls/winedos/vxd.c +++ b/dlls/winedos/vxd.c @@ -264,7 +264,7 @@ void WINAPI VXD_Shell( CONTEXT86 *context ) case 0x0002: case 0x0003: /* SHELL_SYSMODAL_Message - ebx virtual maschine handle + ebx virtual machine handle eax message box flags ecx address of message edi address of caption @@ -272,7 +272,7 @@ void WINAPI VXD_Shell( CONTEXT86 *context ) */ case 0x0004: /* SHELL_Message - ebx virtual maschine handle + ebx virtual machine handle eax message box flags ecx address of message edi address of caption @@ -543,7 +543,7 @@ void WINAPI VXD_APM ( CONTEXT86 *context ) * This means especially that the flat code/data selectors get actually * allocated with base 0x0, so that flat offsets and (real) linear addresses * do again agree! In fact, every call e.g. of a Win32s VxD service now - * has all pointer arguments (which are offsets in the flat data segement) + * has all pointer arguments (which are offsets in the flat data segment) * first reduced by 0x10000 by the W32SKRNL glue code, and then again * increased by 0x10000 by *our* code. * diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 8836672..97b9fa6 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -23,7 +23,7 @@ */ /* NOTE: * with esd we cannot stop the audio that is already in - * the servers buffer. + * the server's buffer. * * FIXME: * pause in waveOut does not work correctly in loop mode @@ -462,7 +462,7 @@ LONG ESD_WaveInit(void) WOutDev[i].esd_fd = -1; memset(&WOutDev[i].caps, 0, sizeof(WOutDev[i].caps)); /* zero out caps values */ - WOutDev[i].caps.wMid = 0x00FF; /* Manufac ID */ + WOutDev[i].caps.wMid = 0x00FF; /* Manufacturer ID */ WOutDev[i].caps.wPid = 0x0001; /* Product ID */ lstrcpyW(WOutDev[i].caps.szPname, ini); snprintf(WOutDev[i].interface_name, sizeof(WOutDev[i].interface_name), "wineesd: %d", i); diff --git a/dlls/winejoystick.drv/joystick.c b/dlls/winejoystick.drv/joystick.c index 02db839..f8d0511 100644 --- a/dlls/winejoystick.drv/joystick.c +++ b/dlls/winejoystick.drv/joystick.c @@ -24,7 +24,7 @@ * - nearly all joystick functions can be regarded as obsolete, * as Linux (2.1.x) now supports extended joysticks with a completely * new joystick driver interface - * New driver's docu says: + * New driver's documentation says: * "For backward compatibility the old interface is still included, * but will be dropped in the future." * Thus we should implement the new interface and at most keep the old @@ -83,7 +83,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(joystick); typedef struct tagWINE_JSTCK { int joyIntf; int in_use; - /* Some extra info we need to make this acutaly work under the + /* Some extra info we need to make this actually work under the Linux 2.2 event api. First of all, we cannot keep closing and reopening the device file - that blows away the state of the stick device, and we lose events. So, we

1 0

Alistair Leslie-Hughes : mscoree: Add stubs for DllCanUnloadNow and DllGetClassObject.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: 832539237073dfc4e703106204732e1770bc16d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=832539237073dfc4e70310620… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 10 15:44:31 2008 +1100 mscoree: Add stubs for DllCanUnloadNow and DllGetClassObject. --- dlls/mscoree/mscoree.spec | 4 ++-- dlls/mscoree/mscoree_main.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index b8b6d91..92efe94 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -29,8 +29,8 @@ @ stub CorTickleSvc @ stub CreateConfigStream @ stub CreateDebuggingInterfaceFromVersion -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub DllRegisterServer @ stub DllUnregisterServer @ stub EEDllGetClassObjectFromClass diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 062f9ae..ecefc27 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -270,3 +270,18 @@ HRESULT WINAPI GetVersionFromProcess(HANDLE hProcess, LPWSTR pVersion, DWORD cch FIXME("(%p, %p, %d, %p): stub\n", hProcess, pVersion, cchBuffer, dwLength); return E_NOTIMPL; } + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) +{ + FIXME("(%p, %p, %p): stub\n", rclsid, riid, ppv); + if(!ppv) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +HRESULT WINAPI DllCanUnloadNow(VOID) +{ + FIXME("stub\n"); + return S_OK; +}

1 0

Gerald Pfeifer : msi: Complete initializers.
by Alexandre Julliard Jan. 10, 2008

Jan. 10, 2008

Module: wine Branch: master Commit: 388edd1086b8fca2bced6c7d82561550ea8c50b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=388edd1086b8fca2bced6c7d8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jan 10 02:58:48 2008 +0100 msi: Complete initializers. --- dlls/msi/table.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 97f0298..c7fbcc2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -105,13 +105,13 @@ static WCHAR szType[] = { 'T','y','p','e',0 }; * Do not mark them const. */ static MSICOLUMNINFO _Columns_cols[4] = { - { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0 }, - { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2 }, - { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4 }, - { szColumns, 4, szType, MSITYPE_VALID | 2, 6 }, + { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, + { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, 0, NULL }, + { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, 0, NULL }, + { szColumns, 4, szType, MSITYPE_VALID | 2, 6, 0, NULL }, }; static MSICOLUMNINFO _Tables_cols[1] = { - { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 0 }, + { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 0, 0, NULL }, }; #define MAX_STREAM_NAME 0x1f

1 0