October 2008 - Wine-Commits

Hongbo Ni : clock: Update simplified Chinese resource.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: stable Commit: da758501630492d0de9d4ed0f68c8f15521fbb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da758501630492d0de9d4ed0f… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 15:21:29 2008 +1000 clock: Update simplified Chinese resource. (cherry picked from commit b46ffb40c654e9175ebcffb6691660385641d4f7) --- programs/clock/Zh.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/clock/Zh.rc b/programs/clock/Zh.rc index e6e0ae8..5d0d9e0 100644 --- a/programs/clock/Zh.rc +++ b/programs/clock/Zh.rc @@ -22,13 +22,13 @@ MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED { POPUP "��ԣ�&P��" { MENUITEM "ģ��ʱ�ӣ�&L��", IDM_ANALOG - MENUITEM "��ʱ�ӣ�&T��", IDM_DIGITAL + MENUITEM "��ʱ�ӣ�&T��", IDM_DIGITAL MENUITEM SEPARATOR MENUITEM "��壨&F��...", IDM_FONT MENUITEM SEPARATOR MENUITEM "�ޱ��&W��", IDM_NOTITLE MENUITEM SEPARATOR - MENUITEM "�루&��", IDM_SECONDS + MENUITEM "�루&S��", IDM_SECONDS MENUITEM "��ڣ�&D��", IDM_DATE MENUITEM SEPARATOR MENUITEM "��ǰ�棨&A��", IDM_ONTOP

1 0

Hongbo Ni : winefile: Update simplified Chinese resource.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: stable Commit: 0f60f7f111c67396a26bfb275d00b9d950ab2b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f60f7f111c67396a26bfb275… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 14:59:23 2008 +1000 winefile: Update simplified Chinese resource. (cherry picked from commit 5070763a0ea27934a350659658bdf995603de75b) --- programs/winefile/Zh.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winefile/Zh.rc b/programs/winefile/Zh.rc index 39851c8..76fa360 100644 --- a/programs/winefile/Zh.rc +++ b/programs/winefile/Zh.rc @@ -110,8 +110,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "ȫ��&U��\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minimize on run", 504 - MENUITEM "&Save settings on exit", 511 + MENUITEM "��С��&M��", 504 + MENUITEM "�˳�ʱ��ã�&S��", 511 }

1 0

Hongbo Ni : notepad: Update simplified Chinese resource.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: stable Commit: 8432b48950560e596d31b4152a8a1940c42a12a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8432b48950560e596d31b4152… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Thu Aug 21 16:20:36 2008 +1000 notepad: Update simplified Chinese resource. (cherry picked from commit 872077674921c3e813b6be6760ec06b036606b58) --- programs/notepad/Zh.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index 46cee03..57dea33 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -44,7 +44,7 @@ POPUP " MENUITEM "��ڡ�ʱ�䣨&T��\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "�Զ��У�&W��", CMD_WRAP - MENUITEM "&Font...", CMD_FONT /* FIXME */ + MENUITEM "��壨&F��...", CMD_FONT /* FIXME */ } POPUP "��&S��" { MENUITEM "��&S��...", CMD_SEARCH @@ -55,7 +55,7 @@ POPUP " MENUITEM "��&S��...", CMD_HELP_SEARCH MENUITEM "��ʹ�ð��&H��", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "��ڼ��±��&A��", CMD_HELP_ABOUT_NOTEPAD } } @@ -84,13 +84,13 @@ EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_ DEFPUSHBUTTON "ȷ��", IDOK, 180, 3, 40, 15, WS_TABSTOP PUSHBUTTON "ȡ��", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "��&��", IDHELP, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "��&H��", IDHELP, 180, 39, 40, 15, WS_TABSTOP } STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "Page &p" +STRING_PAGESETUP_FOOTERVALUE, "&p ҳ" STRING_NOTEPAD, "��±�" STRING_ERROR, "��"

1 0

Vladimir Pankratov : taskmgr: Add Russian translation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: stable Commit: 3e365b477b138bb90fe0c6787fd78aea69f285bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e365b477b138bb90fe0c6787… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Fri Jun 20 17:19:44 2008 +0500 taskmgr: Add Russian translation. (cherry picked from commit 87b5e9448034e580f45541f4bf649604b89fc72e) --- programs/taskmgr/Ru.rc | 500 +++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/taskmgr.rc | 1 + 2 files changed, 501 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e365b477b138bb90fe0c…

1 0

Muneyuki Noguchi : notepad: Update Japanese translation.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: stable Commit: b822c3c51eaa2a0a47ec6089088d4a00fbcad3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b822c3c51eaa2a0a47ec60890… Author: Muneyuki Noguchi <noguchi(a)localhost.localdomain> Date: Fri Aug 22 11:37:44 2008 +0900 notepad: Update Japanese translation. (cherry picked from commit f9bc73e25f549a8cf225929c269ee390b302c9e4) --- programs/notepad/Ja.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index 2573739..eea61fa 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -37,14 +37,14 @@ MAIN_MENU MENU MENUITEM "�I��(&x)", CMD_EXIT } POPUP "�ҏW(&E)" { - MENUITEM "�A��h�D(&U)\tCtrl+Z", CMD_UNDO + MENUITEM "��ɖ߂�(&U)\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR MENUITEM "�؂��(&t)\tCtrl+X", CMD_CUT MENUITEM "�R�s�[(&C)\tCtrl+C", CMD_COPY - MENUITEM "�y�[�X�g(&P)\tCtrl+V", CMD_PASTE + MENUITEM "�\\��t��(&P)\tCtrl+V", CMD_PASTE MENUITEM "�폜(&D)\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "�S�đI��(&a)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "��ׂđI��(&a)\tCtrl+A", CMD_SELECT_ALL MENUITEM "��t�Ǝ��(&T)\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "��s��܂�Ԃ�(&W)", CMD_WRAP @@ -52,14 +52,14 @@ POPUP " } POPUP "��(&S)" { MENUITEM "��(&S)...\tCtrl+F", CMD_SEARCH - MENUITEM "��̌��(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "��(&S)\tF3", CMD_SEARCH_NEXT } POPUP "�w��v(&H)" { MENUITEM "�ڎ�(&C)", CMD_HELP_CONTENTS MENUITEM "��(&S)...", CMD_HELP_SEARCH MENUITEM "�w��v�̎g��(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "��ɂ��(&A)", CMD_HELP_ABOUT_NOTEPAD } }

1 0

Mikołaj Zalewski : winhlp32: Update Polish translation .
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: stable Commit: 2983941eb4570d21314366f6da7bc6b7c0880505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2983941eb4570d21314366f6d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jun 19 12:43:55 2008 +0200 winhlp32: Update Polish translation. (cherry picked from commit 30899341cd6e6753f159dcf806c0cbb1f6bf7f94) --- programs/winhlp32/Pl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/Pl.rc b/programs/winhlp32/Pl.rc index 2c20de4..6b3a767 100644 --- a/programs/winhlp32/Pl.rc +++ b/programs/winhlp32/Pl.rc @@ -77,8 +77,8 @@ STID_HISTORY, "&Historia" STID_TOPICS, "&Tematy" STID_ALL_FILES, "Wszystkie pliki (*.*)" STID_HELP_FILES_HLP, "Pliki pomocy (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_FILE_NOT_FOUND_s "Nie znaleziono pliku '%s'. Czy chcesz poszuka� tego pliku samodzielnie?" +STID_NO_RICHEDIT "Nie uda�o si� znale�� modu�u richedit... Wy�wietlenie pomocy nie jest mo�liwe" }

1 0

Alexandre Julliard : ntdll: Preserve the 2K block size returned for CDROMs.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: stable Commit: bc58d24e9d5200a6569114b8061ee37fcd56fca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc58d24e9d5200a6569114b80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 6 17:52:23 2008 +0200 ntdll: Preserve the 2K block size returned for CDROMs. (cherry picked from commit 4d958a1cb3f79f5e6fe643542385840b497ff867) --- dlls/ntdll/file.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3c7fac5..2387fd8 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2241,10 +2241,18 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io } bsize = stfs.f_bsize; #endif - info->BytesPerSector = 512; - info->SectorsPerAllocationUnit = 8; - info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (512 * 8); - info->AvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (512 * 8); + if (bsize == 2048) /* assume CD-ROM */ + { + info->BytesPerSector = 2048; + info->SectorsPerAllocationUnit = 1; + } + else + { + info->BytesPerSector = 512; + info->SectorsPerAllocationUnit = 8; + } + info->TotalAllocationUnits.QuadPart = bsize * stfs.f_blocks / (info->BytesPerSector * info->SectorsPerAllocationUnit); + info->AvailableAllocationUnits.QuadPart = bsize * stfs.f_bavail / (info->BytesPerSector * info->SectorsPerAllocationUnit); io->Information = sizeof(*info); io->u.Status = STATUS_SUCCESS; }

1 0

Jan-Peter Nilsson : wininet: Fix HTTP_ProcessCookies only processing one cookie.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: b261836709c31422ffe6b30d369cdbf1704e6217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b261836709c31422ffe6b30d3… Author: Jan-Peter Nilsson <peppe(a)bsnet.se> Date: Wed Sep 24 22:42:36 2008 +0200 wininet: Fix HTTP_ProcessCookies only processing one cookie. --- dlls/wininet/http.c | 132 ++++++++++++++++++++++++++------------------------- 1 files changed, 67 insertions(+), 65 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f72082b..0cdbfb3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -314,82 +314,84 @@ static void HTTP_ProcessCookies( LPWININETHTTPREQW lpwhr ) { static const WCHAR szSet_Cookie[] = { 'S','e','t','-','C','o','o','k','i','e',0 }; int HeaderIndex; + int numCookies = 0; LPHTTPHEADERW setCookieHeader; - HeaderIndex = HTTP_GetCustomHeaderIndex(lpwhr, szSet_Cookie, 0, FALSE); - if (HeaderIndex == -1) - return; - setCookieHeader = &lpwhr->pCustHeaders[HeaderIndex]; - - if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES) && setCookieHeader->lpszValue) + while((HeaderIndex = HTTP_GetCustomHeaderIndex(lpwhr, szSet_Cookie, numCookies, FALSE)) != -1) { - int nPosStart = 0, nPosEnd = 0, len; - static const WCHAR szFmt[] = { 'h','t','t','p',':','/','/','%','s','/',0}; + setCookieHeader = &lpwhr->pCustHeaders[HeaderIndex]; - while (setCookieHeader->lpszValue[nPosEnd] != '\0') + if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES) && setCookieHeader->lpszValue) { - LPWSTR buf_cookie, cookie_name, cookie_data; - LPWSTR buf_url; - LPWSTR domain = NULL; - LPHTTPHEADERW Host; - - int nEqualPos = 0; - while (setCookieHeader->lpszValue[nPosEnd] != ';' && setCookieHeader->lpszValue[nPosEnd] != ',' && - setCookieHeader->lpszValue[nPosEnd] != '\0') - { - nPosEnd++; - } - if (setCookieHeader->lpszValue[nPosEnd] == ';') + int nPosStart = 0, nPosEnd = 0, len; + static const WCHAR szFmt[] = { 'h','t','t','p',':','/','/','%','s','/',0}; + + while (setCookieHeader->lpszValue[nPosEnd] != '\0') { - /* fixme: not case sensitive, strcasestr is gnu only */ - int nDomainPosEnd = 0; - int nDomainPosStart = 0, nDomainLength = 0; - static const WCHAR szDomain[] = {'d','o','m','a','i','n','=',0}; - LPWSTR lpszDomain = strstrW(&setCookieHeader->lpszValue[nPosEnd], szDomain); - if (lpszDomain) - { /* they have specified their own domain, lets use it */ - while (lpszDomain[nDomainPosEnd] != ';' && lpszDomain[nDomainPosEnd] != ',' && - lpszDomain[nDomainPosEnd] != '\0') - { - nDomainPosEnd++; + LPWSTR buf_cookie, cookie_name, cookie_data; + LPWSTR buf_url; + LPWSTR domain = NULL; + LPHTTPHEADERW Host; + + int nEqualPos = 0; + while (setCookieHeader->lpszValue[nPosEnd] != ';' && setCookieHeader->lpszValue[nPosEnd] != ',' && + setCookieHeader->lpszValue[nPosEnd] != '\0') + { + nPosEnd++; + } + if (setCookieHeader->lpszValue[nPosEnd] == ';') + { + /* fixme: not case sensitive, strcasestr is gnu only */ + int nDomainPosEnd = 0; + int nDomainPosStart = 0, nDomainLength = 0; + static const WCHAR szDomain[] = {'d','o','m','a','i','n','=',0}; + LPWSTR lpszDomain = strstrW(&setCookieHeader->lpszValue[nPosEnd], szDomain); + if (lpszDomain) + { /* they have specified their own domain, lets use it */ + while (lpszDomain[nDomainPosEnd] != ';' && lpszDomain[nDomainPosEnd] != ',' && + lpszDomain[nDomainPosEnd] != '\0') + { + nDomainPosEnd++; + } + nDomainPosStart = strlenW(szDomain); + nDomainLength = (nDomainPosEnd - nDomainPosStart) + 1; + domain = HeapAlloc(GetProcessHeap(), 0, (nDomainLength + 1)*sizeof(WCHAR)); + lstrcpynW(domain, &lpszDomain[nDomainPosStart], nDomainLength + 1); } - nDomainPosStart = strlenW(szDomain); - nDomainLength = (nDomainPosEnd - nDomainPosStart) + 1; - domain = HeapAlloc(GetProcessHeap(), 0, (nDomainLength + 1)*sizeof(WCHAR)); - lstrcpynW(domain, &lpszDomain[nDomainPosStart], nDomainLength + 1); } - } - if (setCookieHeader->lpszValue[nPosEnd] == '\0') break; - buf_cookie = HeapAlloc(GetProcessHeap(), 0, ((nPosEnd - nPosStart) + 1)*sizeof(WCHAR)); - lstrcpynW(buf_cookie, &setCookieHeader->lpszValue[nPosStart], (nPosEnd - nPosStart) + 1); - TRACE("%s\n", debugstr_w(buf_cookie)); - while (buf_cookie[nEqualPos] != '=' && buf_cookie[nEqualPos] != '\0') - { - nEqualPos++; - } - if (buf_cookie[nEqualPos] == '\0' || buf_cookie[nEqualPos + 1] == '\0') - { + if (setCookieHeader->lpszValue[nPosEnd] == '\0') break; + buf_cookie = HeapAlloc(GetProcessHeap(), 0, ((nPosEnd - nPosStart) + 1)*sizeof(WCHAR)); + lstrcpynW(buf_cookie, &setCookieHeader->lpszValue[nPosStart], (nPosEnd - nPosStart) + 1); + TRACE("%s\n", debugstr_w(buf_cookie)); + while (buf_cookie[nEqualPos] != '=' && buf_cookie[nEqualPos] != '\0') + { + nEqualPos++; + } + if (buf_cookie[nEqualPos] == '\0' || buf_cookie[nEqualPos + 1] == '\0') + { + HeapFree(GetProcessHeap(), 0, buf_cookie); + break; + } + + cookie_name = HeapAlloc(GetProcessHeap(), 0, (nEqualPos + 1)*sizeof(WCHAR)); + lstrcpynW(cookie_name, buf_cookie, nEqualPos + 1); + cookie_data = &buf_cookie[nEqualPos + 1]; + + Host = HTTP_GetHeader(lpwhr,szHost); + len = lstrlenW((domain ? domain : (Host?Host->lpszValue:NULL))) + + strlenW(lpwhr->lpszPath) + 9; + buf_url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + sprintfW(buf_url, szFmt, (domain ? domain : (Host?Host->lpszValue:NULL))); /* FIXME PATH!!! */ + InternetSetCookieW(buf_url, cookie_name, cookie_data); + + HeapFree(GetProcessHeap(), 0, buf_url); HeapFree(GetProcessHeap(), 0, buf_cookie); - break; + HeapFree(GetProcessHeap(), 0, cookie_name); + HeapFree(GetProcessHeap(), 0, domain); + nPosStart = nPosEnd; } - - cookie_name = HeapAlloc(GetProcessHeap(), 0, (nEqualPos + 1)*sizeof(WCHAR)); - lstrcpynW(cookie_name, buf_cookie, nEqualPos + 1); - cookie_data = &buf_cookie[nEqualPos + 1]; - - Host = HTTP_GetHeader(lpwhr,szHost); - len = lstrlenW((domain ? domain : (Host?Host->lpszValue:NULL))) + - strlenW(lpwhr->lpszPath) + 9; - buf_url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - sprintfW(buf_url, szFmt, (domain ? domain : (Host?Host->lpszValue:NULL))); /* FIXME PATH!!! */ - InternetSetCookieW(buf_url, cookie_name, cookie_data); - - HeapFree(GetProcessHeap(), 0, buf_url); - HeapFree(GetProcessHeap(), 0, buf_cookie); - HeapFree(GetProcessHeap(), 0, cookie_name); - HeapFree(GetProcessHeap(), 0, domain); - nPosStart = nPosEnd; } + numCookies++; } }

1 0

Andrey Turkin : kernel32: Add ExitProcess wrapper to please Shrinker.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 7ba54ab45cf2d6f87f238f9985e778847fd3077a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba54ab45cf2d6f87f238f998… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Oct 7 20:16:19 2008 +0400 kernel32: Add ExitProcess wrapper to please Shrinker. --- dlls/kernel32/process.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 759612b..1d68462 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2137,7 +2137,6 @@ BOOL WINAPI TerminateProcess( HANDLE handle, DWORD exit_code ) return !status; } - /*********************************************************************** * ExitProcess (KERNEL32.@) * @@ -2149,6 +2148,26 @@ BOOL WINAPI TerminateProcess( HANDLE handle, DWORD exit_code ) * RETURNS * Nothing. */ +#ifdef __i386__ +__ASM_GLOBAL_FUNC( ExitProcess, /* Shrinker depend on this particular ExitProcess implementation */ + "pushl %ebp\n\t" + ".byte 0x8B, 0xEC\n\t" /* movl %esp, %ebp */ + ".byte 0x6A, 0x00\n\t" /* pushl $0 */ + ".byte 0x68, 0x00, 0x00, 0x00, 0x00\n\t" /* pushl $0 - 4 bytes immediate */ + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("process_ExitProcess") "\n\t" + "leave\n\t" + "ret $4" ) + +void WINAPI process_ExitProcess( DWORD status ) +{ + LdrShutdownProcess(); + NtTerminateProcess(GetCurrentProcess(), status); + exit(status); +} + +#else + void WINAPI ExitProcess( DWORD status ) { LdrShutdownProcess(); @@ -2156,6 +2175,7 @@ void WINAPI ExitProcess( DWORD status ) exit(status); } +#endif /*********************************************************************** * GetExitCodeProcess [KERNEL32.@]

1 0

Kjell Rune Skaaraas : wined3d: Implement IWineD3DResourceImpl_GetPriority and IWineD3DResourceImpl_SetPriority for resource management .
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: ed96dd72e3c8b1a409dc00d46c9f86a1edaa1437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed96dd72e3c8b1a409dc00d46… Author: Kjell Rune Skaaraas <kjellrs(a)sirius.lan> Date: Mon Sep 29 19:52:18 2008 +0200 wined3d: Implement IWineD3DResourceImpl_GetPriority and IWineD3DResourceImpl_SetPriority for resource management. --- dlls/wined3d/device.c | 1 + dlls/wined3d/resource.c | 12 +++++++----- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b5bc82f..79c9f68 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -90,6 +90,7 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 object->resource.format = Format; \ object->resource.usage = Usage; \ object->resource.size = _size; \ + object->resource.priority = 0; \ list_init(&object->resource.privateData); \ /* Check that we have enough video ram left */ \ if (Pool == WINED3DPOOL_DEFAULT) { \ diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 17e540b..c75e09d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -217,16 +217,18 @@ HRESULT WINAPI IWineD3DResourceImpl_FreePrivateData(IWineD3DResource *iface, REF return WINED3D_OK; } -/* Priority support is not implemented yet */ DWORD WINAPI IWineD3DResourceImpl_SetPriority(IWineD3DResource *iface, DWORD PriorityNew) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - FIXME("(%p) : stub\n", This); - return 0; + DWORD PriorityOld = This->resource.priority; + This->resource.priority = PriorityNew; + TRACE("(%p) : new priority %d, returning old priority %d\n", This, PriorityNew, PriorityOld ); + return PriorityOld; } + DWORD WINAPI IWineD3DResourceImpl_GetPriority(IWineD3DResource *iface) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - FIXME("(%p) : stub\n", This); - return 0; + TRACE("(%p) : returning %d\n", This, This->resource.priority ); + return This->resource.priority; } /* Preloading of resources is not supported yet */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d4c6273..bc6a1cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1096,6 +1096,7 @@ typedef struct IWineD3DResourceClass UINT size; DWORD usage; WINED3DFORMAT format; + DWORD priority; BYTE *allocatedMemory; /* Pointer to the real data location */ BYTE *heapMemory; /* Pointer to the HeapAlloced block of memory */ struct list privateData;

1 0