wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Andrew Talbot : ntdll: Remove unused variables.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 664349eacc7ac841e2f75e16b2e7ef189d85696a URL: http://source.winehq.org/git/wine.git/?a=commit;h=664349eacc7ac841e2f75e16b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:05:03 2008 +0100 ntdll: Remove unused variables. --- dlls/ntdll/cdrom.c | 8 -------- dlls/ntdll/loadorder.c | 5 ++--- dlls/ntdll/path.c | 3 +-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index e53e41d..47bda87 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -815,7 +815,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA { NTSTATUS ret = STATUS_NOT_SUPPORTED; #ifdef linux - unsigned size; SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data; int io; struct cdrom_subchnl sc; @@ -860,7 +859,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA switch (fmt->Format) { case IOCTL_CDROM_CURRENT_POSITION: - size = sizeof(SUB_Q_CURRENT_POSITION); RtlEnterCriticalSection( &cache_section ); if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION; @@ -889,7 +887,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA RtlLeaveCriticalSection( &cache_section ); break; case IOCTL_CDROM_MEDIA_CATALOG: - size = sizeof(SUB_Q_MEDIA_CATALOG_NUMBER); data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; { struct cdrom_mcn mcn; @@ -902,7 +899,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA } break; case IOCTL_CDROM_TRACK_ISRC: - size = sizeof(SUB_Q_CURRENT_POSITION); FIXME("TrackIsrc: NIY on linux\n"); data->TrackIsrc.FormatCode = IOCTL_CDROM_TRACK_ISRC; data->TrackIsrc.Tcval = 0; @@ -913,7 +909,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA end: ret = CDROM_GetStatusCode(io); #elif defined(__FreeBSD__) || defined(__NetBSD__) - unsigned size; SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data; int io; struct ioc_read_subchannel read_sc; @@ -974,7 +969,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA switch (fmt->Format) { case IOCTL_CDROM_CURRENT_POSITION: - size = sizeof(SUB_Q_CURRENT_POSITION); RtlEnterCriticalSection( &cache_section ); if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION; @@ -1000,13 +994,11 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA RtlLeaveCriticalSection( &cache_section ); break; case IOCTL_CDROM_MEDIA_CATALOG: - size = sizeof(SUB_Q_MEDIA_CATALOG_NUMBER); data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; data->MediaCatalog.Mcval = sc.what.media_catalog.mc_valid; memcpy(data->MediaCatalog.MediaCatalog, sc.what.media_catalog.mc_number, 15); break; case IOCTL_CDROM_TRACK_ISRC: - size = sizeof(SUB_Q_CURRENT_POSITION); data->TrackIsrc.FormatCode = IOCTL_CDROM_TRACK_ISRC; data->TrackIsrc.Tcval = sc.what.track_info.ti_valid; memcpy(data->TrackIsrc.TrackIsrc, sc.what.track_info.ti_number, 15); diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index c31b633..ae50a4c 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -376,12 +376,11 @@ static enum loadorder get_registry_value( HANDLE hkey, const WCHAR *module ) UNICODE_STRING valueW; char buffer[80]; DWORD count; - BOOL ret; RtlInitUnicodeString( &valueW, module ); - if ((ret = !NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, - buffer, sizeof(buffer), &count ))) + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, + buffer, sizeof(buffer), &count )) { WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data; return parse_load_order( str ); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index d7be183..a6fb090 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -596,7 +596,6 @@ static const WCHAR *skip_unc_prefix( const WCHAR *ptr ) static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) { ULONG reqsize = 0, mark = 0, dep = 0, deplen; - DOS_PATHNAME_TYPE type; LPWSTR ins_str = NULL; LPCWSTR ptr; const UNICODE_STRING* cd; @@ -613,7 +612,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) else cd = &NtCurrentTeb()->Peb->ProcessParameters->CurrentDirectory.DosPath; - switch (type = RtlDetermineDosPathNameType_U(name)) + switch (RtlDetermineDosPathNameType_U(name)) { case UNC_PATH: /* \\foo */ ptr = skip_unc_prefix( name );

1 0

Andrew Talbot : oleaut32: Remove unused variables.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: ba742868e50244e300c2c0a5f7d21ce2adcd04bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba742868e50244e300c2c0a5f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:05:10 2008 +0100 oleaut32: Remove unused variables. --- dlls/oleaut32/typelib.c | 15 +++++++-------- dlls/oleaut32/varformat.c | 2 -- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 123810b..4c710c6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2024,7 +2024,6 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, int offset) { - int j; TLBRefType *ref; TRACE_(typelib)("TLB context %p, TLB offset %x\n", pcx, offset); @@ -2046,7 +2045,7 @@ static void MSFT_DoRefType(TLBContext *pcx, ITypeLibImpl *pTL, MSFT_ReadLEDWords(&impinfo, sizeof(impinfo), pcx, pcx->pTblDir->pImpInfo.offset + (offset & 0xfffffffc)); - for(j=0;pImpLib;j++){ /* search the known offsets of all import libraries */ + while (pImpLib){ /* search the known offsets of all import libraries */ if(pImpLib->offset==impinfo.oImpFile) break; pImpLib=pImpLib->next; } @@ -3284,7 +3283,7 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, SLTG_TypeInfoTail *pTITail) { - char *pFirstItem, *pNextItem; + char *pFirstItem; sltg_ref_lookup_t *ref_lookup = NULL; if(pTIHeader->href_table != 0xffffffff) { @@ -3292,10 +3291,10 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI, pNameTable); } - pFirstItem = pNextItem = pBlk; + pFirstItem = pBlk; if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) { - pNextItem = SLTG_DoImpls(pFirstItem, pTI, FALSE, ref_lookup); + SLTG_DoImpls(pFirstItem, pTI, FALSE, ref_lookup); } HeapFree(GetProcessHeap(), 0, ref_lookup); } @@ -3305,7 +3304,7 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, const SLTG_TypeInfoTail *pTITail) { - char *pFirstItem, *pNextItem; + char *pFirstItem; sltg_ref_lookup_t *ref_lookup = NULL; if(pTIHeader->href_table != 0xffffffff) { @@ -3313,10 +3312,10 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, pNameTable); } - pFirstItem = pNextItem = pBlk; + pFirstItem = pBlk; if(*(WORD*)pFirstItem == SLTG_IMPL_MAGIC) { - pNextItem = SLTG_DoImpls(pFirstItem, pTI, TRUE, ref_lookup); + SLTG_DoImpls(pFirstItem, pTI, TRUE, ref_lookup); } if (pTITail->funcs_off != 0xffff) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 399009c..3b35d38 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -522,7 +522,6 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, FMT_HEADER *header = (FMT_HEADER*)rgbTok; FMT_STRING_HEADER *str_header = (FMT_STRING_HEADER*)(rgbTok + sizeof(FMT_HEADER)); FMT_NUMBER_HEADER *num_header = (FMT_NUMBER_HEADER*)str_header; - FMT_DATE_HEADER *date_header = (FMT_DATE_HEADER*)str_header; BYTE* pOut = rgbTok + sizeof(FMT_HEADER) + sizeof(FMT_STRING_HEADER); BYTE* pLastHours = NULL; BYTE fmt_number = 0; @@ -591,7 +590,6 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, header->starts[fmt_number] = pOut - rgbTok; str_header = (FMT_STRING_HEADER*)pOut; num_header = (FMT_NUMBER_HEADER*)pOut; - date_header = (FMT_DATE_HEADER*)pOut; memset(str_header, 0, sizeof(FMT_STRING_HEADER)); pOut += sizeof(FMT_STRING_HEADER); fmt_state = 0;

1 0

Andrew Talbot : msvcrt: Remove unused variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: bacd4516d69dff48943caa4d0a1875bc4828719a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bacd4516d69dff48943caa4d0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:04:43 2008 +0100 msvcrt: Remove unused variable. --- dlls/msvcrt/undname.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 16991eb..93030b2 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -893,7 +893,6 @@ static BOOL handle_data(struct parsed_symbol* sym) struct datatype_t ct; char* name = NULL; BOOL ret = FALSE; - char dt; /* 0 private static * 1 protected static @@ -924,7 +923,7 @@ static BOOL handle_data(struct parsed_symbol* sym) name = get_class_string(sym, 0); - switch (dt = *sym->current++) + switch (*sym->current++) { case '0': case '1': case '2': case '3': case '4': case '5':

1 0

Andrew Talbot : msvfw32: Remove unused variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 7b0c084e502238fad7fd2d5654b7a8b5678b3512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0c084e502238fad7fd2d565… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 22 22:04:49 2008 +0100 msvfw32: Remove unused variable. --- dlls/msvfw32/drawdib.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 137716d..902f0ca 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -458,7 +458,6 @@ HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB hdd) UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) { WINE_HDD *whdd; - HPALETTE oldPal; UINT ret = 0; FIXME("(%p, %p, %d), stub\n", hdd, hdc, fBackground); @@ -475,7 +474,7 @@ UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) if (!whdd->hpal) whdd->hpal = CreateHalftonePalette(hdc); - oldPal = SelectPalette(hdc, whdd->hpal, fBackground); + SelectPalette(hdc, whdd->hpal, fBackground); ret = RealizePalette(hdc); out:

1 0

Paul Vriens : gdi32/tests: Run tests on win9x again.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 55902e0ce0e80dd3b6c50a7fc85a4f2d28cfb43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=55902e0ce0e80dd3b6c50a7fc… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Apr 22 20:47:29 2008 +0200 gdi32/tests: Run tests on win9x again. --- dlls/gdi32/tests/font.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 803994b..c627521 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -492,7 +492,7 @@ static void test_GetCharABCWidths(void) hfont = SelectObject(hdc, hfont); nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); - ok(nb == 1, "pGetGlyphIndicesW should have returned 1\n"); + ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = pGetCharABCWidthsI(NULL, 0, 1, glyphs, abc); ok(!ret, "GetCharABCWidthsI should have failed\n"); @@ -602,7 +602,7 @@ static void test_GetGlyphIndices(void) HFONT hOldFont; if (!pGetGlyphIndicesW) { - skip("GetGlyphIndices not available on platform\n"); + skip("GetGlyphIndicesW not available on platform\n"); return; } @@ -611,12 +611,12 @@ static void test_GetGlyphIndices(void) ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndices should have returned a nonexistent char not %04x\n", glyphs[4]); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok((glyphs[4] == 0x001f || glyphs[4] == 0xffff /* Vista */), "GetGlyphIndicesW should have returned a nonexistent char not %04x\n", glyphs[4]); flags = 0; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndices should have returned a %04x not %04x\n", + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", textm.tmDefaultChar, glyphs[4]); if(!is_font_installed("Tahoma")) @@ -633,14 +633,14 @@ static void test_GetGlyphIndices(void) ok(GetTextMetrics(hdc, &textm), "GetTextMetric failed\n"); flags |= GGI_MARK_NONEXISTING_GLYPHS; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == 0xffff, "GetGlyphIndices should have returned 0xffff char not %04x\n", glyphs[4]); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + ok(glyphs[4] == 0xffff, "GetGlyphIndicesW should have returned 0xffff char not %04x\n", glyphs[4]); flags = 0; testtext[0] = textm.tmDefaultChar; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); - ok(charcount == 5, "GetGlyphIndices count of glyphs should = 5 not %d\n", charcount); - todo_wine ok(glyphs[0] == 0, "GetGlyphIndices for tmDefaultChar should be 0 not %04x\n", glyphs[0]); - ok(glyphs[4] == 0, "GetGlyphIndices should have returned 0 not %04x\n", glyphs[4]); + ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); + todo_wine ok(glyphs[0] == 0, "GetGlyphIndicesW for tmDefaultChar should be 0 not %04x\n", glyphs[0]); + ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); } @@ -1130,7 +1130,7 @@ static BOOL get_glyph_indices(INT charset, UINT code_page, WORD *idx, UINT count SetLastError(0xdeadbeef); ret = pGetGlyphIndicesW(hdc, unicode_buf, count, idx, 0); - ok(ret == count, "GetGlyphIndicesA error %u\n", GetLastError()); + ok(ret == count, "GetGlyphIndicesW error %u\n", GetLastError()); } else { @@ -1513,7 +1513,7 @@ static void test_negative_width(HDC hdc, const LOGFONTA *lf) hfont_prev = SelectObject(hdc, hfont); - ret = GetGlyphIndicesA(hdc, "x", 1, &idx, GGI_MARK_NONEXISTING_GLYPHS); + ret = pGetGlyphIndicesA(hdc, "x", 1, &idx, GGI_MARK_NONEXISTING_GLYPHS); if (ret == GDI_ERROR || idx == 0xffff) { SelectObject(hdc, hfont_prev);

1 0

Joris Huizer : mshtml: Fixed copy/paste mistake.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 1a0bf043bc6cdf37eab345ab266a771498250453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0bf043bc6cdf37eab345ab2… Author: Joris Huizer <jorishuizer@debian> Date: Tue Apr 22 16:27:32 2008 +0200 mshtml: Fixed copy/paste mistake. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0bb2ebf..425fb39 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1361,7 +1361,7 @@ static ULONG WINAPI DocDispatchEx_Release(IDispatchEx *iface) { HTMLDocument *This = DISPEX_THIS(iface); - return IHTMLWindow2_AddRef(HTMLDOC(This)); + return IHTMLWindow2_Release(HTMLDOC(This)); } static HRESULT WINAPI DocDispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo)

1 0

Frans Kool : start: Fixed Dutch translations.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 30a00e8dfd605d7e8d6b8d8e4566a3c27ded39a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a00e8dfd605d7e8d6b8d8e4… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Apr 22 15:44:59 2008 +0200 start: Fixed Dutch translations. --- programs/start/Nl.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/start/Nl.rc b/programs/start/Nl.rc index 14c0355..d6202b3 100644 --- a/programs/start/Nl.rc +++ b/programs/start/Nl.rc @@ -2,6 +2,7 @@ * Start (Dutch resources) * * Copyright 2003 Hans Leidekker + * Copyright 2008 Frans Kool * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ Options: \n\ /MAX[imized] Start het programma gemaximaliseerd. \n\ /R[estored] Start het programma normaal (noch geminimaliseerd noch gemaximaliseerd). \n\ /W[ait] Wacht totdat het gestarte programma is be�indigd, eindig dan met de exit code van dat programma. \n\ +/Unix Gebruik een Unix bestandsnaam en start het bestand als de windows verkenner. \n\ /L Laat de gebruikerslicentie zien. \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ @@ -59,4 +61,6 @@ See the COPYING.LIB file for license information. \n\ " STRING_EXECFAIL "Programma kan niet worden gestart, of er is geen programma verbonden met het opgegeven bestand.\nShellExecuteEx is mislukt" + +STRING_UNIXFAIL "Kon de opgegeven Unix bestandsnaam niet omzetten naar een DOS bestandsnaam." }

1 0

Jeff Latimer : user32/tests: Fix typedefs & function definitions so that the code compiles in visual C++ 2005 .
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 41e757c812e5a2abd22839475451eda63b9e1964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e757c812e5a2abd22839475… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Apr 22 23:49:42 2008 +1000 user32/tests: Fix typedefs & function definitions so that the code compiles in visual C++ 2005. --- dlls/user32/tests/broadcast.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 5806ed9..67e767e 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -32,8 +32,8 @@ #include "wine/test.h" -typedef LONG WINAPI (*PBROADCAST)( DWORD,LPDWORD,UINT,WPARAM,LPARAM ); -typedef LONG WINAPI (*PBROADCASTEX)( DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO ); +typedef LONG (WINAPI *PBROADCAST)( DWORD,LPDWORD,UINT,WPARAM,LPARAM ); +typedef LONG (WINAPI *PBROADCASTEX)( DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO ); static PBROADCAST pBroadcastA; static PBROADCAST pBroadcastW; static PBROADCASTEX pBroadcastExA; @@ -249,8 +249,8 @@ static void test_parametersEx(PBROADCASTEX broadcastex) PulseEvent(hevent); } -static BOOL WINAPI (*pOpenProcessToken)(HANDLE, DWORD, HANDLE*); -static BOOL WINAPI (*pAdjustTokenPrivileges)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD); +static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, HANDLE*); +static BOOL (WINAPI *pAdjustTokenPrivileges)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD); static void test_noprivileges(void) {

1 0

ByeongSik Jeon : shdoclc: Update Korean translation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: fcbc9fad96912fe47eb0473500618cca679aff4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcbc9fad96912fe47eb047350… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:43:56 2008 +0900 shdoclc: Update Korean translation. --- dlls/shdoclc/Ko.rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/shdoclc/Ko.rc b/dlls/shdoclc/Ko.rc index dde528b..d038994 100644 --- a/dlls/shdoclc/Ko.rc +++ b/dlls/shdoclc/Ko.rc @@ -18,7 +18,18 @@ */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_MESSAGE_BOX_TITLE, "Wine ��ͳ� Explorer" +} + +STRINGTABLE DISCARDABLE +{ + IDS_PRINT_HEADER_TEMPLATE "&w&bPage &p" /* FIXME: should be "&w&bPage &p of &P" */ + IDS_PRINT_FOOTER_TEMPLATE "&u&b&d" +} IDR_BROWSE_CONTEXT_MENU MENU {

1 0

ByeongSik Jeon : net: Update Korean translation.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 2440834b42f5b2a5462cdfe930b137e548a35f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2440834b42f5b2a5462cdfe93… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Tue Apr 22 21:43:48 2008 +0900 net: Update Korean translation. --- programs/net/Ko.rc | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/net/Ko.rc b/programs/net/Ko.rc index 8d78dde..23055f5 100644 --- a/programs/net/Ko.rc +++ b/programs/net/Ko.rc @@ -20,22 +20,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "�� ɾ�� :\n\nNET [ HELP | START | STOP ]\n" + STRING_USAGE, "�� ɾ�� :\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "�� .\n" STRING_STOP_USAGE, "�� .\n" - STRING_STOP_DEP, "�� : %s\n" + STRING_STOP_DEP, "��ӵ� �� : %s\n" STRING_CANT_STOP, "%s ��񽺸� �� ϴ�\n" STRING_NO_SCM, "�� ڸ� �ٷ� �� ϴ�.\n" - STRING_NO_SVCHANDLE, "��񽺸� �ٷ� �� ϴ�.\n" + STRING_NO_SVCHANDLE, "�� ڵ�� ϴ�.\n" STRING_START_SVC, "%s ��񽺴� ��.\n" STRING_START_SVC_SUCCESS, " %s �� .\n" STRING_START_SVC_FAIL, "%s �� .\n" STRING_STOP_SVC, "%s �� .\n" STRING_STOP_SVC_SUCCESS, "%s �� .\n" STRING_STOP_SVC_FAIL, "%s �� .\n" - STRING_HELP_USAGE, "��ɾ� ��:\n\nNET HELP ��ɾ� \n -or-\nNET ��ɾ� /HELP\n\n �� ɾ�:\n NET HELP NET START NET STOP\n" + STRING_HELP_USAGE, "��ɾ� ��:\n\nNET HELP ��ɾ� \n -or-\nNET ��ɾ� /HELP\n\n"\ + " �� ɾ�:\n NET HELP NET START NET STOP\n" + STRING_NO_ENTRIES, "��Ʈ�� ֽ��ϴ�.\n" + STRING_USE_HEADER, "\n�� \n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S �� ҽ�: %lu\n" }

1 0

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 April 2008