November 2011 - Wine-Commits

Alexandre Julliard : shell32/tests: Avoid some array bounds warnings.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 30a7d0a5a73cca607f2ed77497fd8acaef74688e URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a7d0a5a73cca607f2ed7749… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 11:44:35 2011 +0100 shell32/tests: Avoid some array bounds warnings. --- dlls/shell32/tests/shlfolder.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c61a972..bee6cb5 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1806,6 +1806,7 @@ static void test_ITEMIDLIST_format(void) { cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) { struct FileStructW *pFileStructW = (struct FileStructW *)(((LPBYTE)pidlFile)+cbOffset); + WCHAR *name = pFileStructW->wszName; ok(pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen, "FileStructW's offset and length should add up to the PIDL's length!\n"); @@ -1842,9 +1843,9 @@ static void test_ITEMIDLIST_format(void) { /* TODO: Perform check for date being within one day.*/ } - ok (!lstrcmpW(wszFile[i], pFileStructW->wszName) || - !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)) || /* Vista */ - !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 26)), /* Win7 */ + ok (!lstrcmpW(wszFile[i], name) || + !lstrcmpW(wszFile[i], name + 9) || /* Vista */ + !lstrcmpW(wszFile[i], name + 11), /* Win7 */ "The filename should be stored in unicode at this position!\n"); } }

1 0

Andrew Talbot : dplayx: Remove extraneous braces from switch statement.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: f640ba231b9d7ecbd8d081d4b14c3af4792842f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f640ba231b9d7ecbd8d081d4b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:31 2011 +0000 dplayx: Remove extraneous braces from switch statement. --- dlls/dplayx/dplay.c | 22 ++-------------------- 1 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 501b749..87eb185 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -648,23 +648,18 @@ HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody, { /* Name server needs to handle this request */ case DPMSGCMD_ENUMSESSIONSREQUEST: - { /* Reply expected */ NS_ReplyToEnumSessionsRequest( lpcMessageBody, lplpReply, lpdwMsgSize, This ); - break; - } /* Name server needs to handle this request */ case DPMSGCMD_ENUMSESSIONSREPLY: - { /* No reply expected */ NS_AddRemoteComputerAsNameServer( lpcMessageHeader, This->dp2->spData.dwSPHeaderSize, lpcMessageBody, This->dp2->lpNameServerData ); break; - } case DPMSGCMD_REQUESTNEWPLAYERID: { @@ -691,56 +686,43 @@ HRESULT DP_HandleMessage( IDirectPlay2Impl* This, LPCVOID lpcMessageBody, TRACE( "Allocating new playerid 0x%08x from remote request\n", lpReply->dpidNewPlayerId ); - break; } case DPMSGCMD_GETNAMETABLEREPLY: case DPMSGCMD_NEWPLAYERIDREPLY: - { - #if 0 if( wCommandId == DPMSGCMD_NEWPLAYERIDREPLY ) DebugBreak(); #endif DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); - break; - } #if 1 case DPMSGCMD_JUSTENVELOPE: - { TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08x\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] ); NS_SetLocalAddr( This->dp2->lpNameServerData, lpcMessageHeader, 20 ); DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); - } #endif case DPMSGCMD_FORWARDADDPLAYER: - { #if 0 DebugBreak(); #endif #if 1 - TRACE( "Sending message to self to get my addr\n" ); - DP_MSG_ToSelf( This, 1 ); /* This is a hack right now */ + TRACE( "Sending message to self to get my addr\n" ); + DP_MSG_ToSelf( This, 1 ); /* This is a hack right now */ #endif break; - } case DPMSGCMD_FORWARDADDPLAYERNACK: - { DP_MSG_ErrorReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); break; - } default: - { FIXME( "Unknown wCommandId %u. Ignoring message\n", wCommandId ); DebugBreak(); break; - } } /* FIXME: There is code in dplaysp.c to handle dplay commands. Move to here. */

1 0

Andrew Talbot : msi: Remove extraneous braces from switch statement.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 3358b541ac830c16877985d0efbc15063eedf791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3358b541ac830c16877985d0e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:52 2011 +0000 msi: Remove extraneous braces from switch statement. --- dlls/msi/tokenize.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 8f6fe0f..64e14b8 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -193,16 +193,14 @@ static const char isIdChar[] = { int sqliteGetToken(const WCHAR *z, int *tokenType){ int i; switch( *z ){ - case ' ': case '\t': case '\n': case '\f': { + case ' ': case '\t': case '\n': case '\f': for(i=1; isspace(z[i]) && z[i] != '\r'; i++){} *tokenType = TK_SPACE; return i; - } - case '-': { + case '-': if( z[1]==0 ) return -1; *tokenType = TK_MINUS; return 1; - } case '(': *tokenType = TK_LP; return 1; @@ -215,7 +213,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ case '=': *tokenType = TK_EQ; return 1; - case '<': { + case '<': if( z[1]=='=' ){ *tokenType = TK_LE; return 2; @@ -226,8 +224,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ *tokenType = TK_LT; return 1; } - } - case '>': { + case '>': if( z[1]=='=' ){ *tokenType = TK_GE; return 2; @@ -235,8 +232,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ *tokenType = TK_GT; return 1; } - } - case '!': { + case '!': if( z[1]!='=' ){ *tokenType = TK_ILLEGAL; return 2; @@ -244,7 +240,6 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ *tokenType = TK_NE; return 2; } - } case '?': *tokenType = TK_WILDCARD; return 1; @@ -264,32 +259,28 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ *tokenType = TK_STRING; return i; } - case '.': { + case '.': if( !isdigit(z[1]) ){ *tokenType = TK_DOT; return 1; } /* Fall thru into the next case */ - } case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': { + case '5': case '6': case '7': case '8': case '9': *tokenType = TK_INTEGER; for(i=1; isdigit(z[i]); i++){} return i; - } - case '[': { + case '[': for(i=1; z[i] && z[i-1]!=']'; i++){} *tokenType = TK_ID; return i; - } - default: { + default: if( !isIdChar[*z] ){ break; } for(i=1; isIdChar[z[i]]; i++){} *tokenType = sqliteKeywordCode(z, i); return i; - } } *tokenType = TK_ILLEGAL; return 1;

1 0

Andrew Talbot : sane.ds: Remove extraneous braces from switch statement.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 8cf1f49005564dd5769fef730ae31d7da8a64fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf1f49005564dd5769fef730… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:54:08 2011 +0000 sane.ds: Remove extraneous braces from switch statement. --- dlls/sane.ds/ui.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 8ff3b70..815478d 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -1011,17 +1011,13 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM } } case WM_COMMAND: + switch (HIWORD(wParam)) { - switch (HIWORD(wParam)) - { - case BN_CLICKED: - ButtonClicked(hwndDlg,LOWORD(wParam), - (HWND)lParam); - break; - case CBN_SELCHANGE: - ComboChanged(hwndDlg,LOWORD(wParam), - (HWND)lParam); - } + case BN_CLICKED: + ButtonClicked(hwndDlg,LOWORD(wParam), (HWND)lParam); + break; + case CBN_SELCHANGE: + ComboChanged(hwndDlg,LOWORD(wParam), (HWND)lParam); } }

1 0

Alexandre Julliard : gdi32: Retrieve the brush pattern bits from the cache for enhanced metafiles.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 03e0d96b9e95629ff26e78d79288ef9d7b7acc44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e0d96b9e95629ff26e78d79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 22:06:23 2011 +0100 gdi32: Retrieve the brush pattern bits from the cache for enhanced metafiles. --- dlls/gdi32/enhmfdrv/objects.c | 106 ++++++++++++++-------------------------- 1 files changed, 37 insertions(+), 69 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 52e9cb4..027b6a3 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -132,86 +132,54 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) index = 0; } break; - case BS_DIBPATTERN: - { - EMRCREATEDIBPATTERNBRUSHPT *emr; - DWORD bmSize, biSize, size; - BITMAPINFO *info = (BITMAPINFO *)logbrush.lbHatch; - - if (info->bmiHeader.biCompression) - bmSize = info->bmiHeader.biSizeImage; - else - bmSize = get_dib_image_size( info ); - biSize = bitmap_info_size(info, LOWORD(logbrush.lbColor)); - size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + biSize + bmSize; - emr = HeapAlloc( GetProcessHeap(), 0, size ); - if(!emr) break; - emr->emr.iType = EMR_CREATEDIBPATTERNBRUSHPT; - emr->emr.nSize = size; - emr->ihBrush = index = EMFDRV_AddHandle( dev, hBrush ); - emr->iUsage = LOWORD(logbrush.lbColor); - emr->offBmi = sizeof(EMRCREATEDIBPATTERNBRUSHPT); - emr->cbBmi = biSize; - emr->offBits = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + biSize; - emr->cbBits = bmSize; - memcpy((char *)emr + sizeof(EMRCREATEDIBPATTERNBRUSHPT), info, - biSize + bmSize ); - - if(!EMFDRV_WriteRecord( dev, &emr->emr )) - index = 0; - HeapFree( GetProcessHeap(), 0, emr ); - } - break; - case BS_PATTERN: + case BS_DIBPATTERN: { EMRCREATEDIBPATTERNBRUSHPT *emr; char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; - struct gdi_image_bits bits; - DWORD size; + BITMAPINFO *info = (BITMAPINFO *)buffer; + DWORD info_size, image_size; + void *bits; + UINT usage; - if (!get_bitmap_image( (HANDLE)logbrush.lbHatch, src_info, &bits )) break; - if (src_info->bmiHeader.biBitCount != 1) - { - FIXME("Trying to create a color pattern brush\n"); - if (bits.free) bits.free( &bits ); - break; - } + if (!get_brush_bitmap_info( hBrush, info, &bits, &usage )) break; + info_size = bitmap_info_size( info, usage ); + image_size = get_dib_image_size( info ); - /* FIXME: There is an extra DWORD written by native before the BMI. - * Not sure what its meant to contain. - */ - size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + sizeof(DWORD) + - sizeof(BITMAPINFOHEADER) + src_info->bmiHeader.biSizeImage; + emr = HeapAlloc( GetProcessHeap(), 0, sizeof(EMRCREATEDIBPATTERNBRUSHPT)+info_size+image_size ); + if(!emr) break; - emr = HeapAlloc( GetProcessHeap(), 0, size ); - if(!emr) + if (logbrush.lbStyle == BS_PATTERN && info->bmiHeader.biBitCount == 1) { - if (bits.free) bits.free( &bits ); - break; + /* Presumably to reduce the size of the written EMF, MS supports an + * undocumented iUsage value of 2, indicating a mono bitmap without the + * 8 byte 2 entry black/white palette. Stupidly, they could have saved + * over 20 bytes more by also ignoring the BITMAPINFO fields that are + * irrelevant/constant for monochrome bitmaps. + * FIXME: It may be that the DIB functions themselves accept this value. + */ + emr->emr.iType = EMR_CREATEMONOBRUSH; + usage = DIB_PAL_MONO; + /* FIXME: There is an extra DWORD written by native before the BMI. + * Not sure what its meant to contain. + */ + emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ) + sizeof(DWORD); + emr->cbBmi = sizeof( BITMAPINFOHEADER ); } - - dst_info = (BITMAPINFO *)((LPBYTE)(emr + 1) + sizeof(DWORD)); - dst_info->bmiHeader = src_info->bmiHeader; - memcpy( &dst_info->bmiHeader + 1, bits.ptr, dst_info->bmiHeader.biSizeImage ); - if (bits.free) bits.free( &bits ); - - emr->emr.iType = EMR_CREATEMONOBRUSH; - emr->emr.nSize = size; + else + { + emr->emr.iType = EMR_CREATEDIBPATTERNBRUSHPT; + emr->offBmi = sizeof( EMRCREATEDIBPATTERNBRUSHPT ); + emr->cbBmi = info_size; + } + emr->emr.nSize = emr->offBits + emr->cbBits; emr->ihBrush = index = EMFDRV_AddHandle( dev, hBrush ); - /* Presumably to reduce the size of the written EMF, MS supports an - * undocumented iUsage value of 2, indicating a mono bitmap without the - * 8 byte 2 entry black/white palette. Stupidly, they could have saved - * over 20 bytes more by also ignoring the BITMAPINFO fields that are - * irrelevant/constant for monochrome bitmaps. - * FIXME: It may be that the DIB functions themselves accept this value. - */ - emr->iUsage = DIB_PAL_MONO; - emr->offBmi = (LPBYTE)dst_info - (LPBYTE)emr; - emr->cbBmi = sizeof( BITMAPINFOHEADER ); + emr->iUsage = usage; emr->offBits = emr->offBmi + emr->cbBmi; - emr->cbBits = dst_info->bmiHeader.biSizeImage; + emr->cbBits = image_size; + + memcpy( (BYTE *)emr + emr->offBmi, info, emr->cbBmi ); + memcpy( (BYTE *)emr + emr->offBits, bits, emr->cbBits ); if(!EMFDRV_WriteRecord( dev, &emr->emr )) index = 0;

1 0

Andrew Talbot : secur32: Superfluous semicolons fix.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 7f17934de2f800ea2f1c7468083ef119d77481cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f17934de2f800ea2f1c74680… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:54:50 2011 +0000 secur32: Superfluous semicolons fix. --- dlls/secur32/ntlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index f865158..4c353c3 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1973,7 +1973,7 @@ static const SecPkgInfoA infoA = { #define NEGO_COMMENT { 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', ' ', \ 'P', 'a', 'c', 'k', 'a', 'g', 'e', ' ', \ - 'N', 'e', 'g', 'o', 't', 'i', 'a', 't', 'o', 'r', 0}; + 'N', 'e', 'g', 'o', 't', 'i', 'a', 't', 'o', 'r', 0} static CHAR nego_comment_A[] = NEGO_COMMENT; static WCHAR nego_comment_W[] = NEGO_COMMENT;

1 0

Andrew Talbot : msvcp90: Superfluous semicolons fix.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 43bbce728ab60fe24c2ecc19cd55aec036090dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bbce728ab60fe24c2ecc19c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:54:30 2011 +0000 msvcp90: Superfluous semicolons fix. --- dlls/msvcp90/exception.c | 10 +++++----- dlls/msvcp90/memory.c | 20 ++++++++++---------- dlls/msvcp90/msvcp90.h | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 100ceed..00fb0f0 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -688,11 +688,11 @@ static const cxx_exception_type invalid_argument_cxx_type = { #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif - __ASM_EXCEPTION_VTABLE(bad_alloc) - __ASM_EXCEPTION_STRING_VTABLE(logic_error) - __ASM_EXCEPTION_STRING_VTABLE(length_error) - __ASM_EXCEPTION_STRING_VTABLE(out_of_range) - __ASM_EXCEPTION_STRING_VTABLE(invalid_argument) + __ASM_EXCEPTION_VTABLE(bad_alloc); + __ASM_EXCEPTION_STRING_VTABLE(logic_error); + __ASM_EXCEPTION_STRING_VTABLE(length_error); + __ASM_EXCEPTION_STRING_VTABLE(out_of_range); + __ASM_EXCEPTION_STRING_VTABLE(invalid_argument); #ifndef __GNUC__ } #endif diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 85d80ae..4ecc379 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -61,7 +61,7 @@ void* __thiscall MSVCP_allocator_char_copy_ctor(void *this, const void *copy) /* ??4?$allocator(a)D@std@@QAEAAV01(a)ABV01@@Z */ /* ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_assign, 8) void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign) { return this; @@ -69,7 +69,7 @@ void* __thiscall MSVCP_allocator_char_assign(void *this, const void *assign) /* ?deallocate@?$allocator(a)D@std@@QAEXPADI(a)Z */ /* ?deallocate@?$allocator(a)D@std@@QEAAXPEAD_K(a)Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_deallocate, 12) void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_size_t size) { MSVCRT_operator_delete(ptr); @@ -77,7 +77,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_siz /* ?allocate@?$allocator(a)D@std@@QAEPADI(a)Z */ /* ?allocate@?$allocator(a)D@std@@QEAAPEAD_K(a)Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8) char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) { return MSVCRT_operator_new(sizeof(char[count])); @@ -85,7 +85,7 @@ char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) /* ?allocate@?$allocator(a)D@std@@QAEPADIPBX(a)Z */ /* ?allocate@?$allocator(a)D@std@@QEAAPEAD_KPEBX(a)Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate_hint, 12) char* __thiscall MSVCP_allocator_char_allocate_hint(void *this, MSVCP_size_t count, const void *hint) { @@ -95,7 +95,7 @@ char* __thiscall MSVCP_allocator_char_allocate_hint(void *this, /* ?construct@?$allocator(a)D@std@@QAEXPADABD(a)Z */ /* ?construct@?$allocator(a)D@std@@QEAAXPEADAEBD(a)Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_construct, 12); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_construct, 12) void __thiscall MSVCP_allocator_char_construct(void *this, char *ptr, const char *val) { *ptr = *val; @@ -103,14 +103,14 @@ void __thiscall MSVCP_allocator_char_construct(void *this, char *ptr, const char /* ?destroy@?$allocator(a)D@std@@QAEXPAD(a)Z */ /* ?destroy@?$allocator(a)D@std@@QEAAXPEAD(a)Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_destroy, 8) void __thiscall MSVCP_allocator_char_destroy(void *this, char *ptr) { } /* ?max_size@?$allocator(a)D@std@@QBEIXZ */ /* ?max_size@?$allocator(a)D@std@@QEBA_KXZ */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_max_size, 4) MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void *this) { return UINT_MAX/sizeof(char); @@ -315,7 +315,7 @@ MSVCP_size_t __thiscall MSVCP_allocator_short_max_size(void *this) /* allocator<void> */ /* ??0?$allocator(a)X@std@@QAE(a)XZ */ /* ??0?$allocator(a)X@std@@QEAA(a)XZ */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_ctor, 4); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_ctor, 4) void* __thiscall MSVCP_allocator_void_ctor(void *this) { return this; @@ -323,7 +323,7 @@ void* __thiscall MSVCP_allocator_void_ctor(void *this) /* ??0?$allocator(a)X@std@@QAE(a)ABV01@@Z */ /* ??0?$allocator(a)X@std@@QEAA(a)AEBV01@@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_copy_ctor, 8); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_copy_ctor, 8) void* __thiscall MSVCP_allocator_void_copy_ctor(void *this, void *copy) { return this; @@ -331,7 +331,7 @@ void* __thiscall MSVCP_allocator_void_copy_ctor(void *this, void *copy) /* ??4?$allocator(a)X@std@@QAEAAV01(a)ABV01@@Z */ /* ??4?$allocator(a)X@std@@QEAAAEAV01(a)AEBV01@@Z */ -DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8); +DEFINE_THISCALL_WRAPPER(MSVCP_allocator_void_assign, 8) void* __thiscall MSVCP_allocator_void_assign(void *this, void *assign) { return this; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 1365223..b9000a4 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -73,7 +73,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*); "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ "\t.quad " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \ - funcs "\n\t.text"); + funcs "\n\t.text") #else @@ -84,7 +84,7 @@ extern void* (__cdecl *MSVCRT_set_new_handler)(void*); "\t.globl " __ASM_NAME("MSVCP_" #name "_vtable") "\n" \ __ASM_NAME("MSVCP_" #name "_vtable") ":\n" \ "\t.long " THISCALL_NAME(MSVCP_ ## name ## _vector_dtor) "\n" \ - funcs "\n\t.text"); + funcs "\n\t.text") #endif /* _WIN64 */

1 0

Andrew Talbot : kernel32: Remove extraneous braces from switch statement.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: d5ad5ca91ca6aa1a3eb2a3849bb0dbcb6f67f5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ad5ca91ca6aa1a3eb2a3849… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:46 2011 +0000 kernel32: Remove extraneous braces from switch statement. --- dlls/kernel32/volume.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index e2b03a2..5d7a07d 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -585,12 +585,10 @@ static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE ha case FS_FAT32: return GETLONG( superblock, 0x33 ); case FS_UDF: - { - if (!VOLUME_ReadCDBlock(handle, block, 257*BLOCK_SIZE)) - break; - superblock = block; - /* fallthrough */ - } + if (!VOLUME_ReadCDBlock(handle, block, 257*BLOCK_SIZE)) + break; + superblock = block; + /* fallthrough */ case FS_ISO9660: { BYTE sum[4];

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: f61fb839280a82a8264699f79ffbfe9e4b52d683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f61fb839280a82a8264699f79… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Nov 6 21:48:26 2011 +0900 po: Updated Korean translation. --- po/ko.po | 74 +++++++++++++++++++++----------------------------------------- 1 files changed, 25 insertions(+), 49 deletions(-) diff --git a/po/ko.po b/po/ko.po index 4ad63f2..c5c5475 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6838,9 +6838,8 @@ msgid "Trash" msgstr "휴지통" #: shlwapi.rc:27 -#, fuzzy msgid "%d bytes" -msgstr "%ld 바이트" +msgstr "%d 바이트" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -7768,9 +7767,8 @@ msgstr "" "\n" #: attrib.rc:28 -#, fuzzy msgid "%1: File Not Found\n" -msgstr "%s :파일을 찾을 수 없습니다\n" +msgstr "%1 :파일을 찾을 수 없습니다\n" #: attrib.rc:47 msgid "" @@ -8690,14 +8688,12 @@ msgstr "" "'서비스'는 정지할 서비스의 이름입니다.\n" #: net.rc:30 -#, fuzzy msgid "Stopping dependent service: %1\n" -msgstr "종속된 서비스 정지중: %s\n" +msgstr "종속된 서비스 정지중: %1\n" #: net.rc:31 -#, fuzzy msgid "Could not stop service %1\n" -msgstr "%s 서비스를 정지할 수 없습니다\n" +msgstr "%1 서비스를 정지할 수 없음\n" #: net.rc:32 msgid "Could not get handle to service control manager.\n" @@ -8708,34 +8704,28 @@ msgid "Could not get handle to service.\n" msgstr "서비스 핸들을 얻을 수 없습니다.\n" #: net.rc:34 -#, fuzzy msgid "The %1 service is starting.\n" -msgstr "%s 서비스는 시작중.\n" +msgstr "%1 서비스는 시작중입니다.\n" #: net.rc:35 -#, fuzzy msgid "The %1 service was started successfully.\n" -msgstr "%s 서비스 시작 성공.\n" +msgstr "%1 서비스 시작 성공했습니다.\n" #: net.rc:36 -#, fuzzy msgid "The %1 service failed to start.\n" -msgstr "%s 서비스 시작 실패.\n" +msgstr "%1 서비스 시작 실패했습니다.\n" #: net.rc:37 -#, fuzzy msgid "The %1 service is stopping.\n" -msgstr "%s 서비스 정지.\n" +msgstr "%1 서비스는 정지하는 중입니다.\n" #: net.rc:38 -#, fuzzy msgid "The %1 service was stopped successfully.\n" -msgstr "%s 서비스 정지 성공.\n" +msgstr "%1 서비스 정지 성공했습니다.\n" #: net.rc:39 -#, fuzzy msgid "The %1 service failed to stop.\n" -msgstr "%s 서비스 정지 실패.\n" +msgstr "%1 서비스 정지 실패했습니다.\n" #: net.rc:41 msgid "There are no entries in the list.\n" @@ -8752,9 +8742,8 @@ msgstr "" "---------------------------------------------------------------\n" #: net.rc:43 -#, fuzzy msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%s %s %s 열린 리소스: %lu\n" +msgstr "%1 %2 %3 열린 리소스: %4!u!\n" #: net.rc:44 notepad.rc:122 oleview.rc:159 oleview.rc:172 wineconsole.rc:131 #: winefile.rc:131 winefile.rc:154 winefile.rc:184 winemine.rc:68 @@ -8901,9 +8890,8 @@ msgid "&Bottom:" msgstr "아래(&B):" #: notepad.rc:131 -#, fuzzy msgid "Encoding:" -msgstr "인코딩(&E)" +msgstr "인코딩:" #: notepad.rc:66 msgid "Page &p" @@ -8931,7 +8919,7 @@ msgstr "제목 없음" #: notepad.rc:76 msgid "Text files (*.txt)" -msgstr "텍스트 문서 (*.txt)" +msgstr "텍스트 파일 (*.txt)" #: notepad.rc:79 msgid "" @@ -11037,9 +11025,8 @@ msgid "Screen buffer size must be greater or equal to the window's one" msgstr "스크린 버퍼 크기는 반드시 창보다 같거나 커야합니다." #: wineconsole.rc:34 -#, fuzzy msgid "Each character is %1!u! pixels wide on %2!u! pixels high" -msgstr "각각의 글자는 %ld 픽셀 너비에 %ld 픽셀 높이를 가집니다" +msgstr "각각의 글자는 %1!u! 픽셀 너비에 %2!u! 픽셀 높이를 가집니다" #: wineconsole.rc:35 msgid "This is a test" @@ -11349,9 +11336,8 @@ msgid "Index/Inode" msgstr "인덱스/아이노드" #: winefile.rc:120 -#, fuzzy msgid "%1 of %2 free" -msgstr "%s of %s 사용가능" +msgstr "%1 의 %2 사용가능" #: winemine.rc:34 msgid "&Game" @@ -11422,9 +11408,8 @@ msgid "Rows" msgstr "가로줄" #: winemine.rc:87 -#, fuzzy msgid "Columns" -msgstr "세로줄(&C)" +msgstr "세로줄" #: winemine.rc:88 msgid "Mines" @@ -11882,59 +11867,50 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "올바르지 않은 매개변수의 갯수 - xcopy /?로 도움말을 보시오\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "올바르지 않은 매개변수 '%s' - xcopy /?로 도움말을 보시오\n" +msgstr "올바르지 않은 매개변수 '%1' - xcopy /?로 도움말을 보시오\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" msgstr "<enter> 를 누르면 복사가 시작될 것입니다\n" #: xcopy.rc:30 -#, fuzzy msgid "%1!d! file(s) would be copied\n" -msgstr "%d 파일이 복사될 것입니다\n" +msgstr "%1!d! 파일이 복사될 것입니다\n" #: xcopy.rc:31 -#, fuzzy msgid "%1!d! file(s) copied\n" -msgstr "%d 파일이 복사되었습니다\n" +msgstr "%1!d! 파일이 복사되었습니다\n" #: xcopy.rc:34 -#, fuzzy msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"'%s'이 복사할 파일이나 디렉토리?\n" +"'%1'이 복사할 파일이나 디렉토리\n" "입니까?\n" "(F - 파일, D - 디렉토리)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s? (예|아니오)\n" +msgstr "%1? (예|아니오)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "%s를 덮어쓰겠습니까? (예|아니오|모두)\n" +msgstr "%1를 덮어쓰겠습니까? (예|아니오|모두)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "r/c %d로 '%s'를 '%s'로 복사 실패 \n" +msgstr "r/c %3!d!로 '%1'를 '%2'로 복사 실패 \n" #: xcopy.rc:38 -#, fuzzy msgid "Failed to open '%1'\n" -msgstr "'%s' 열기 실패\n" +msgstr "'%1' 열기 실패\n" #: xcopy.rc:39 -#, fuzzy msgid "Failed during reading of '%1'\n" -msgstr "'%s를 읽지 못했습니다'\n" +msgstr "'%1를 읽지 못했습니다'\n" #: xcopy.rc:43 msgctxt "File key"

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 9b7178e63352aee5e23c6e2e1d09a1866f64e156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7178e63352aee5e23c6e2e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 7 00:12:09 2011 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 555ad23..3060379 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1745,12 +1745,12 @@ static void AttachmentTest(void) ddsd.dwWidth = 64; ddsd.dwHeight = 64; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xF800; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x07E0; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x001F; memset(&ddsd2, 0, sizeof(ddsd2)); ddsd2.dwSize = sizeof(ddsd2); @@ -1758,10 +1758,10 @@ static void AttachmentTest(void) ddsd2.dwWidth = ddsd.dwWidth; ddsd2.dwHeight = ddsd.dwHeight; ddsd2.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - U4(ddsd2).ddpfPixelFormat.dwSize = sizeof(U4(ddsd2).ddpfPixelFormat); - U4(ddsd2).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; - U1(U4(ddsd2).ddpfPixelFormat).dwZBufferBitDepth = 16; - U3(U4(ddsd2).ddpfPixelFormat).dwZBitMask = 0x0000FFFF; + ddsd2.ddpfPixelFormat.dwSize = sizeof(ddsd2.ddpfPixelFormat); + ddsd2.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(ddsd2.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(ddsd2.ddpfPixelFormat).dwZBitMask = 0x0000FFFF; hr = IDirectDraw_CreateSurface(lpDD, (DDSURFACEDESC *)&ddsd, &surface1, NULL); ok(hr == DD_OK, "CreateSurface returned %08x\n", hr);

1 0