January 2010 - Wine-commits

Marcin Baczyński : fnt2bdf: Remove superfluous void* casts.
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: c7183e831b6fc3f42ace23266cddb6f090bf4d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7183e831b6fc3f42ace23266… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Wed Jan 6 23:38:35 2010 +0100 fnt2bdf: Remove superfluous void* casts. --- tools/fnt2bdf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c index 5534ff9..89e24c8 100644 --- a/tools/fnt2bdf.c +++ b/tools/fnt2bdf.c @@ -290,7 +290,7 @@ static int parse_fnt_data(unsigned char* file_buffer, int length) /* malloc size = (# chars) * sizeof(WinCharS) */ - if((cpe_font_struct.dfCharTable = (WinCharS *) calloc(sizeof(WinCharS), l_len)) == NULL) + if((cpe_font_struct.dfCharTable = calloc(sizeof(WinCharS), l_len)) == NULL) return ERROR_MEMORY; /* NOW, convert them all to UNIX (lton) notation... */ @@ -649,7 +649,7 @@ static int get_resource_table(int fd, unsigned char** lpdata, int fsize) } else return FILE_ERROR; - *lpdata = (unsigned char*)malloc(size); + *lpdata = malloc(size); if( *lpdata ) { @@ -711,7 +711,7 @@ int main(int argc, char **argv) length = return_data_value(dfShort, &pFontStorage->length) << size_shift; offset = return_data_value(dfShort, &pFontStorage->offset) << size_shift; - if( !(lpfont = (unsigned char*) realloc( lpfont, length )) ) + if( !(lpfont = realloc( lpfont, length )) ) { fprintf(stderr, "Memory allocation error.\n" ); exit(1);

1 0

Detlef Riekenberg : comdlg32: Remove unused code for the Button psh1.
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: aa389201e5b16b454932db497e69613100c94ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa389201e5b16b454932db497… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 6 23:52:11 2010 +0100 comdlg32: Remove unused code for the Button psh1. --- dlls/comdlg32/printdlg.c | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 149694a..5bf776f 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1561,24 +1561,6 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, } break; -#if 0 - case psh1: /* Print Setup */ - { - PRINTDLG16 pdlg; - - if (!PrintStructures->dlg.lpPrintDlg16) { - FIXME("The 32bit print dialog does not have this button!?\n"); - break; - } - - memcpy(&pdlg,PrintStructures->dlg.lpPrintDlg16,sizeof(pdlg)); - pdlg.Flags |= PD_PRINTSETUP; - pdlg.hwndOwner = HWND_16(hDlg); - if (!PrintDlg16(&pdlg)) - break; - } - break; -#endif case psh2: /* Properties button */ { HANDLE hPrinter; @@ -1733,11 +1715,6 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, } break; - case psh1: /* Print Setup */ - { - ERR("psh1 is called from 16bit code only, we should not get here.\n"); - } - break; case psh2: /* Properties button */ { HANDLE hPrinter;

1 0

Detlef Riekenberg : mlang: Print a FIXME only for unused parameter.
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: 69b0b5e09677203b348e2059ae05161abdbd22c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b0b5e09677203b348e2059a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jan 7 00:47:07 2010 +0100 mlang: Print a FIXME only for unused parameter. --- dlls/mlang/mlang.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 49f0605..47b1745 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3007,9 +3007,6 @@ exit: return hr; } -/* - * TODO: handle dwFlag and lpFallBack -*/ static HRESULT WINAPI fnIMultiLanguage2_ConvertStringToUnicodeEx( IMultiLanguage3* iface, DWORD* pdwMode, @@ -3021,7 +3018,10 @@ static HRESULT WINAPI fnIMultiLanguage2_ConvertStringToUnicodeEx( DWORD dwFlag, WCHAR* lpFallBack) { - FIXME("\n"); + if (dwFlag || lpFallBack) + FIXME("Ignoring dwFlag (0x%x/%d) and lpFallBack (%p)\n", + dwFlag, dwFlag, lpFallBack); + return ConvertINetMultiByteToUnicode(pdwMode, dwEncoding, pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); }

1 0

James Hawkins : advapi32: Fix a few memory leaks. Use the correct API to free SIDs (FreeSid).
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: 621a772d48e944e33520639729c02865ffdde9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621a772d48e944e3352063972… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 6 18:26:39 2010 -0800 advapi32: Fix a few memory leaks. Use the correct API to free SIDs (FreeSid). --- dlls/advapi32/tests/security.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8c986e5..029568c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1490,7 +1490,7 @@ static void test_CreateWellKnownSid(void) } } - LocalFree(domainsid); + FreeSid(domainsid); } static void test_LookupAccountSid(void) @@ -1812,7 +1812,7 @@ static BOOL get_sid_info(PSID psid, LPSTR *user, LPSTR *dom) static void check_wellknown_name(const char* name, WELL_KNOWN_SID_TYPE result) { SID_IDENTIFIER_AUTHORITY ident = { SECURITY_NT_AUTHORITY }; - PSID domainsid; + PSID domainsid = NULL; char wk_sid[SECURITY_MAX_SID_SIZE]; DWORD cb; @@ -1862,6 +1862,7 @@ static void check_wellknown_name(const char* name, WELL_KNOWN_SID_TYPE result) ok(sid_use == SidTypeWellKnownGroup , "Expected Use (5), got %d\n", sid_use); cleanup: + FreeSid(domainsid); HeapFree(GetProcessHeap(),0,psid); HeapFree(GetProcessHeap(),0,domain); } @@ -2615,8 +2616,8 @@ static void test_SetEntriesInAcl(void) ok(NewAcl != NULL, "returned acl was NULL\n"); LocalFree(NewAcl); - LocalFree(UsersSid); - LocalFree(EveryoneSid); + FreeSid(UsersSid); + FreeSid(EveryoneSid); HeapFree(GetProcessHeap(), 0, OldAcl); }

1 0

James Hawkins : advpack: Free the file list on any error.
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: ced5081eb98c3b3fe6a9a724532309d23f9ef62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced5081eb98c3b3fe6a9a7245… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 6 18:26:45 2010 -0800 advpack: Free the file list on any error. --- dlls/advpack/files.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 679d236..f6056f2 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -648,6 +648,18 @@ static DWORD fill_file_list(SESSION *session, LPCSTR szCabName, LPCSTR szFileLis return dwNumFound; } +static void free_file_list(SESSION* session) +{ + struct FILELIST *next, *curr = session->FileList; + + while (curr) + { + next = curr->next; + free_file_node(curr); + curr = next; + } +} + /*********************************************************************** * ExtractFilesA (ADVPACK.@) * @@ -728,20 +740,8 @@ HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, session.Operation |= EXTRACT_EXTRACTFILES; res = pExtract(&session, CabName); - if (session.FileList) - { - struct FILELIST *curr = session.FileList; - struct FILELIST *next; - - while (curr) - { - next = curr->next; - free_file_node(curr); - curr = next; - } - } - done: + free_file_list(&session); FreeLibrary(hCabinet); HeapFree(GetProcessHeap(), 0, szConvertedList);

1 0

Henri Verbeet : wined3d: Recognize the SM4 break opcode.
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: 58233befb788185b64a7e08e7323072986fa8ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58233befb788185b64a7e08e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 6 23:22:14 2010 +0100 wined3d: Recognize the SM4 break opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 59ac6bf..b473844 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); enum wined3d_sm4_opcode { WINED3D_SM4_OP_ADD = 0x00, + WINED3D_SM4_OP_BREAK = 0x02, WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, @@ -108,6 +109,7 @@ struct sysval_map static const struct wined3d_sm4_opcode_info opcode_table[] = { {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, + {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, 0, 0}, {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, 0, 1}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2},

1 0

Henri Verbeet : wined3d: Recognize the SM4 endif opcode.
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: 0296aaa6a6a0bb2178bea38caf5814d4b32dd302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0296aaa6a6a0bb2178bea38ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 6 23:22:15 2010 +0100 wined3d: Recognize the SM4 endif opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b473844..782289e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -54,6 +54,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EMIT = 0x13, + WINED3D_SM4_OP_ENDIF = 0x15, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_IADD = 0x1e, WINED3D_SM4_OP_IF = 0x1f, @@ -114,6 +115,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0}, + {WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, 0, 0}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, 1, 2}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, 0, 1},

1 0

Henri Verbeet : wined3d: Recognize the SM4 endloop opcode.
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: 449e52198460297c7b5967ab114e41735cb773ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=449e52198460297c7b5967ab1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 6 23:22:16 2010 +0100 wined3d: Recognize the SM4 endloop opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 782289e..1b23de2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -55,6 +55,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EMIT = 0x13, WINED3D_SM4_OP_ENDIF = 0x15, + WINED3D_SM4_OP_ENDLOOP = 0x16, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_IADD = 0x1e, WINED3D_SM4_OP_IF = 0x1f, @@ -116,6 +117,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0}, {WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, 0, 0}, + {WINED3D_SM4_OP_ENDLOOP,WINED3DSIH_ENDLOOP, 0, 0}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, 1, 2}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, 0, 1},

1 0

Henri Verbeet : wined3d: Recognize the SM4 cut opcode.
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: 46cefd312ca6ef46b42ea5474515525b995490f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46cefd312ca6ef46b42ea5474… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 6 23:22:17 2010 +0100 wined3d: Recognize the SM4 cut opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cf7a429..48f0e41 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4678,6 +4678,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CMP */ pshader_hw_cmp, /* WINED3DSIH_CND */ pshader_hw_cnd, /* WINED3DSIH_CRS */ shader_hw_map2gl, + /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ NULL, /* WINED3DSIH_DEF */ NULL, /* WINED3DSIH_DEFB */ NULL, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index f0fe664..2ec6858 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -45,6 +45,7 @@ static const char *shader_opcode_names[] = /* WINED3DSIH_CMP */ "cmp", /* WINED3DSIH_CND */ "cnd", /* WINED3DSIH_CRS */ "crs", + /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_DCL */ "dcl", /* WINED3DSIH_DEF */ "def", /* WINED3DSIH_DEFB */ "defb", diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 344a266..7392dc7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4720,6 +4720,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CMP */ shader_glsl_cmp, /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, + /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ NULL, /* WINED3DSIH_DEF */ NULL, /* WINED3DSIH_DEFB */ NULL, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 1b23de2..e5b4609 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -51,6 +51,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_ADD = 0x00, WINED3D_SM4_OP_BREAK = 0x02, WINED3D_SM4_OP_BREAKC = 0x03, + WINED3D_SM4_OP_CUT = 0x09, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EMIT = 0x13, @@ -113,6 +114,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, 0, 0}, {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, 0, 1}, + {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, 0, 0}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cba17b0..d501247 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -410,6 +410,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CMP, WINED3DSIH_CND, WINED3DSIH_CRS, + WINED3DSIH_CUT, WINED3DSIH_DCL, WINED3DSIH_DEF, WINED3DSIH_DEFB,

1 0

Marcin Baczyński : advapi32/tests: Remove superfluous void* cast.
by Alexandre Julliard 07 Jan '10

07 Jan '10

Module: wine Branch: master Commit: 005b9066f43b5abde9803ae3fad5809eeea6152d URL: http://source.winehq.org/git/wine.git/?a=commit;h=005b9066f43b5abde9803ae3f… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Wed Jan 6 23:38:27 2010 +0100 advapi32/tests: Remove superfluous void* cast. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 001b909..8c986e5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1673,7 +1673,7 @@ static void test_LookupAccountSid(void) This assumes this process is running under the account of the current user.*/ ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &hToken); ret = GetTokenInformation(hToken, TokenUser, NULL, 0, &cbti); - ptiUser = (PTOKEN_USER) HeapAlloc(GetProcessHeap(), 0, cbti); + ptiUser = HeapAlloc(GetProcessHeap(), 0, cbti); if (GetTokenInformation(hToken, TokenUser, ptiUser, cbti, &cbti)) { acc_sizeA = dom_sizeA = MAX_PATH;

1 0