November 2011 - Wine-commits

Alexandre Julliard : shell32/tests: Avoid some array bounds warnings.
by Alexandre Julliard 07 Nov '11

07 Nov '11

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

Alexandre Julliard : advpack: Pass all the specified parameters to do_ocx_reg.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 2d60d9146097c4f8daad27c11891c6a71c439193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d60d9146097c4f8daad27c11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 11:45:18 2011 +0100 advpack: Pass all the specified parameters to do_ocx_reg. --- dlls/advpack/advpack.c | 4 ++-- dlls/advpack/advpack_private.h | 2 +- dlls/advpack/install.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 112d38a..919c0bc 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -452,7 +452,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, } /* registers the OCX if do_reg is TRUE, unregisters it otherwise */ -HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg) +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) { DLLREGISTER reg_func; @@ -519,7 +519,7 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) if (!hm) goto done; - hr = do_ocx_reg(hm, TRUE); + hr = do_ocx_reg(hm, TRUE, str_flags, param); done: FreeLibrary(hm); diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 23babf6..cbbbf48 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,7 +21,7 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H -HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg) DECLSPEC_HIDDEN; +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; LPWSTR get_parameter(LPWSTR *params, WCHAR separator) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 129ea82..6079625 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -161,7 +161,7 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg) hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (hm) { - if (do_ocx_reg(hm, TRUE) != S_OK) + if (do_ocx_reg(hm, TRUE, NULL, NULL) != S_OK) hr = E_FAIL; FreeLibrary(hm);

1 0

Andrew Talbot : dplayx: Remove extraneous braces from switch statement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

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 : inetcomm: Remove extraneous braces from switch statements.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: f03c8a19a280bd5b464659e8c874536fe5dc13d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03c8a19a280bd5b464659e8c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:39 2011 +0000 inetcomm: Remove extraneous braces from switch statements. --- dlls/inetcomm/pop3transport.c | 41 +++++++++++------------------------------ 1 files changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index b0e31df..af7d1bf 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -63,7 +63,6 @@ static HRESULT parse_response(POP3Transport *This) switch (This->state) { case STATE_NONE: - { if (strlen(This->response) < 3) { WARN("parse error\n"); @@ -78,7 +77,7 @@ static HRESULT parse_response(POP3Transport *This) } This->state = STATE_DONE; return S_FALSE; - } + default: return S_OK; } } @@ -92,7 +91,6 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl) switch (This->state) { case STATE_OK: - { if (This->type == POP3CMD_GET_POPID) { if ((p = strchr(This->ptr, ' '))) @@ -111,9 +109,8 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl) } This->state = STATE_MULTILINE; return S_OK; - } + case STATE_MULTILINE: - { if (This->response[0] == '.' && !This->response[1]) { This->valid_info = FALSE; @@ -128,14 +125,12 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl) This->valid_info = TRUE; return S_OK; } - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat) @@ -147,7 +142,6 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat) switch (This->state) { case STATE_OK: - { if ((p = strchr(This->ptr, ' '))) { while (*p == ' ') p++; @@ -156,14 +150,12 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat) This->state = STATE_DONE; return S_OK; } - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) @@ -175,7 +167,6 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) switch (This->state) { case STATE_OK: - { if (This->type == POP3CMD_GET_POPID) { if ((p = strchr(This->ptr, ' '))) @@ -189,9 +180,8 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) } This->state = STATE_MULTILINE; return S_OK; - } + case STATE_MULTILINE: - { if (This->response[0] == '.' && !This->response[1]) { This->valid_info = FALSE; @@ -206,14 +196,12 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) This->valid_info = TRUE; return S_OK; } - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_dele_response(POP3Transport *This, DWORD *dwPopId) @@ -221,18 +209,15 @@ static HRESULT parse_dele_response(POP3Transport *This, DWORD *dwPopId) switch (This->state) { case STATE_OK: - { *dwPopId = 0; /* FIXME */ This->state = STATE_DONE; return S_OK; - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) @@ -240,7 +225,6 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) switch (This->state) { case STATE_OK: - { retr->fHeader = FALSE; retr->fBody = FALSE; retr->dwPopId = This->msgid; @@ -251,7 +235,7 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) This->state = STATE_MULTILINE; This->valid_info = FALSE; return S_OK; - } + case STATE_MULTILINE: { int len; @@ -273,13 +257,12 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) This->valid_info = TRUE; return S_OK; } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) @@ -287,7 +270,6 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) switch (This->state) { case STATE_OK: - { top->fHeader = FALSE; top->fBody = FALSE; top->dwPopId = This->msgid; @@ -299,7 +281,7 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) This->state = STATE_MULTILINE; This->valid_info = FALSE; return S_OK; - } + case STATE_MULTILINE: { int len; @@ -321,13 +303,12 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) This->valid_info = TRUE; return S_OK; } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static void init_parser(POP3Transport *This, POP3COMMAND command, POP3CMDTYPE type)

1 0

Andrew Talbot : kernel32: Remove extraneous braces from switch statement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

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

Andrew Talbot : msi: Remove extraneous braces from switch statement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

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 : oledlg: Remove extraneous braces from switch statement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 47a68bbdbe983ac045029d4fece00eec782b4dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a68bbdbe983ac045029d4fe… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:59 2011 +0000 oledlg: Remove extraneous braces from switch statement. --- dlls/oledlg/insobjdlg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 01d242e..c801fba 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -197,11 +197,9 @@ static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) UIINSERTOBJECTDLG_AddControl(pdlgInfo); case IDC_OBJTYPELIST: - { if (wNotifyCode == LBN_SELCHANGE) UIINSERTOBJECTDLG_SelChange(pdlgInfo); break; - } } return 0; }

1 0

Andrew Talbot : sane.ds: Remove extraneous braces from switch statement.
by Alexandre Julliard 07 Nov '11

07 Nov '11

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

Andrew Talbot : wined3d: Remove extraneous braces from switch statements.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: e0cd19d88dbdd6a8a69989747e5a8335fad4c086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0cd19d88dbdd6a8a69989747… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:54:17 2011 +0000 wined3d: Remove extraneous braces from switch statements. --- dlls/wined3d/glsl_shader.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d1f3bff..32ac385 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -426,11 +426,9 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con } case HEAP_NODE_POP: - { heap_idx >>= 1; --stack_idx; break; - } } } checkGLcall("walk_constant_heap()"); @@ -501,11 +499,9 @@ static inline void walk_constant_heap_clamped(const struct wined3d_gl_info *gl_i } case HEAP_NODE_POP: - { heap_idx >>= 1; --stack_idx; break; - } } } checkGLcall("walk_constant_heap_clamped()");

1 0

Andrew Talbot : msvcp90: Superfluous semicolons fix.
by Alexandre Julliard 07 Nov '11

07 Nov '11

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