September 2011 - Wine-commits

Francois Gouget : shlwapi: Add parentheses to clarify the precedence between '&' and '&&'.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: bdb65df98294896e490fc58531e6e7200015f3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb65df98294896e490fc5853… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:22:14 2011 +0200 shlwapi: Add parentheses to clarify the precedence between '&' and '&&'. --- dlls/shlwapi/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 7bd3dfe..43c3225 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -2974,7 +2974,7 @@ UINT WINAPI PathGetCharTypeW(WCHAR ch) { if (ch < 126) { - if ((ch & 0x1 && ch != ';') || !ch || isalnum(ch) || ch == '$' || ch == '&' || ch == '(' || + if (((ch & 0x1) && ch != ';') || !ch || isalnum(ch) || ch == '$' || ch == '&' || ch == '(' || ch == '.' || ch == '@' || ch == '^' || ch == '\'' || ch == 130 || ch == '`') flags |= GCT_SHORTCHAR; /* All these are valid for DOS */

1 0

Francois Gouget : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Spanish translation .
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 9dfbd60c37797873f9fa40abf94b0ac162b18156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dfbd60c37797873f9fa40abf… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:27:34 2011 +0200 po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Spanish translation. --- po/es.po | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/po/es.po b/po/es.po index ea1fa5d..8be0a79 100644 --- a/po/es.po +++ b/po/es.po @@ -8151,12 +8151,14 @@ msgstr "" "llamante.\n" #: cmd.rc:40 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "Ayuda sobre CD\n" #: cmd.rc:41 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" msgstr "Ayuda sobre CHDIR\n" @@ -8165,22 +8167,27 @@ msgid "CLS clears the console screen.\n" msgstr "CLS limpia la pantalla de la consola\n" #: cmd.rc:45 +#, fuzzy msgid "COPY <filename> copies a file.\n" msgstr "Ayuda sobre COPY\n" #: cmd.rc:46 +#, fuzzy msgid "CTTY changes the input/output device.\n" msgstr "Ayuda sobre CTTY\n" #: cmd.rc:47 +#, fuzzy msgid "DATE shows or changes the system date.\n" msgstr "Ayuda sobre DATE\n" #: cmd.rc:48 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" msgstr "Ayuda sobre DEL\n" #: cmd.rc:49 +#, fuzzy msgid "DIR lists the contents of a directory.\n" msgstr "Ayuda sobre DIR\n" @@ -8205,6 +8212,7 @@ msgstr "" "precediéndolo por un signo @.\n" #: cmd.rc:61 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "Ayuda sobre ERASE\n" @@ -8251,6 +8259,7 @@ msgstr "" "GOTO no tiene efecto cuando se usa interactivamente.\n" #: cmd.rc:84 +#, fuzzy msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" @@ -8293,10 +8302,12 @@ msgstr "" "Puede ver la etiqueta de volumen del disco con el comando VOL.\n" #: cmd.rc:103 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "Ayuda sobre MD\n" #: cmd.rc:104 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" msgstr "Ayuda sobre MKDIR\n" @@ -8411,6 +8422,7 @@ msgstr "" "comentario en un archivo por lotes.\n" #: cmd.rc:156 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "Ayuda sobre REN\n" @@ -8420,10 +8432,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "Ayuda sobre RENAME\n" #: cmd.rc:159 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgstr "Ayuda sobre RD\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "Ayuda sobre RMDIR\n" @@ -8475,6 +8489,7 @@ msgstr "" "de comando.\n" #: cmd.rc:185 +#, fuzzy msgid "TIME sets or shows the current system time.\n" msgstr "Ayuda sobre TIME\n" @@ -8516,6 +8531,7 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER muestra la versión de cmd que está ejecutando\n" #: cmd.rc:205 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" msgstr "Ayuda sobre VOL\n"

1 0

Francois Gouget : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Portuguese (Portugal) translation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 2f0f07a30f56b8091a4be9206fd2919b1a07651c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0f07a30f56b8091a4be9206… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:27:41 2011 +0200 po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Portuguese (Portugal) translation. --- po/pt_PT.po | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 0dc85cf..24a3b8b 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8112,12 +8112,14 @@ msgstr "" "do procedimente chamado são herdados pelo chamador.\n" #: cmd.rc:40 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "Ajuda do comando CD\n" #: cmd.rc:41 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" msgstr "Ajuda do comando CHDIR\n" @@ -8126,22 +8128,27 @@ msgid "CLS clears the console screen.\n" msgstr "CLS limpa a ecrã da consola\n" #: cmd.rc:45 +#, fuzzy msgid "COPY <filename> copies a file.\n" msgstr "Ajuda do comando COPY\n" #: cmd.rc:46 +#, fuzzy msgid "CTTY changes the input/output device.\n" msgstr "Ajuda do comando CTTY\n" #: cmd.rc:47 +#, fuzzy msgid "DATE shows or changes the system date.\n" msgstr "Ajuda do comando DATE\n" #: cmd.rc:48 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" msgstr "Ajuda do comando DEL\n" #: cmd.rc:49 +#, fuzzy msgid "DIR lists the contents of a directory.\n" msgstr "Ajuda do comando DIR\n" @@ -8166,6 +8173,7 @@ msgstr "" "símbolo @ precedendo o mesmo.\n" #: cmd.rc:61 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "Ajuda do comando ERASE\n" @@ -8214,6 +8222,7 @@ msgstr "" "GOTO não tem efeito quando usado interactivamente.\n" #: cmd.rc:84 +#, fuzzy msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" @@ -8255,10 +8264,12 @@ msgstr "" "especificado. Pode mostrar o rótulo do disco com o comando VOL.\n" #: cmd.rc:103 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "Ajuda do comando MD\n" #: cmd.rc:104 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" msgstr "Ajuda do comando MKDIR\n" @@ -8372,6 +8383,7 @@ msgstr "" "ficheiro de lote\n" #: cmd.rc:156 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "Ajuda do comando REN\n" @@ -8381,10 +8393,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "Ajuda do comando RENAME\n" #: cmd.rc:159 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgstr "Ajuda do comando RD\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "Ajuda do comando RMDIR\n" @@ -8433,6 +8447,7 @@ msgstr "" "Isto não tem efeito se chamado a partir da linha de comando.\n" #: cmd.rc:185 +#, fuzzy msgid "TIME sets or shows the current system time.\n" msgstr "Ajuda do comando TIME\n" @@ -8473,6 +8488,7 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER mostra a versão em execução do cmd.\n" #: cmd.rc:205 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" msgstr "Ajuda do comando VOL\n"

1 0

Francois Gouget : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Portuguese (Brazil) translation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: d171242b2eb852dc932152bec36ebc0b5b4ea6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d171242b2eb852dc932152bec… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:27:54 2011 +0200 po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Portuguese (Brazil) translation. --- po/pt_BR.po | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 761eb88..ddd36ea 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8064,12 +8064,14 @@ msgstr "" "do procedimente chamado são herdados pelo chamador.\n" #: cmd.rc:40 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "Ajuda do comando CD\n" #: cmd.rc:41 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" msgstr "Ajuda do comando CHDIR\n" @@ -8078,22 +8080,27 @@ msgid "CLS clears the console screen.\n" msgstr "CLS limpa a tela do console\n" #: cmd.rc:45 +#, fuzzy msgid "COPY <filename> copies a file.\n" msgstr "Ajuda do comando COPY\n" #: cmd.rc:46 +#, fuzzy msgid "CTTY changes the input/output device.\n" msgstr "Ajuda do comando CTTY\n" #: cmd.rc:47 +#, fuzzy msgid "DATE shows or changes the system date.\n" msgstr "Ajuda do comando DATE\n" #: cmd.rc:48 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" msgstr "Ajuda do comando DEL\n" #: cmd.rc:49 +#, fuzzy msgid "DIR lists the contents of a directory.\n" msgstr "Ajuda do comando DIR\n" @@ -8118,6 +8125,7 @@ msgstr "" "símbolo @ precedendo o mesmo.\n" #: cmd.rc:61 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "Ajuda do comando ERASE\n" @@ -8166,6 +8174,7 @@ msgstr "" "GOTO não tem efeito quando usando interativamente.\n" #: cmd.rc:84 +#, fuzzy msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" @@ -8207,10 +8216,12 @@ msgstr "" "especificado. Você pode mostrar o rótulo do disco com o comando VOL.\n" #: cmd.rc:103 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "Ajuda do comando MD\n" #: cmd.rc:104 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" msgstr "Ajuda do comando MKDIR\n" @@ -8324,6 +8335,7 @@ msgstr "" "arquivo de lote\n" #: cmd.rc:156 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "Ajuda do comando REN\n" @@ -8333,10 +8345,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "Ajuda do comando RENAME\n" #: cmd.rc:159 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgstr "Ajuda do comando RD\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "Ajuda do comando RMDIR\n" @@ -8385,6 +8399,7 @@ msgstr "" "Isto não tem efeito se chamado a partir da linha de comando.\n" #: cmd.rc:185 +#, fuzzy msgid "TIME sets or shows the current system time.\n" msgstr "Ajuda do comando TIME\n" @@ -8425,6 +8440,7 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER mostra a versão em execução do cmd.\n" #: cmd.rc:205 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" msgstr "Ajuda do comando VOL\n"

1 0

Francois Gouget : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Italian translation .
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 426bd63aecafd06cba6d8ac2ceab723019c00c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=426bd63aecafd06cba6d8ac2c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:28:13 2011 +0200 po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Italian translation. --- po/it.po | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/po/it.po b/po/it.po index e35fb36..9909f4a 100644 --- a/po/it.po +++ b/po/it.po @@ -8105,12 +8105,14 @@ msgstr "" "procedura chiamata sono ereditati dalla chiamante.\n" #: cmd.rc:40 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "Aiuto su CD\n" #: cmd.rc:41 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" msgstr "Aiuto su CHDIR\n" @@ -8119,22 +8121,27 @@ msgid "CLS clears the console screen.\n" msgstr "CLS pulisce la schermata della console\n" #: cmd.rc:45 +#, fuzzy msgid "COPY <filename> copies a file.\n" msgstr "Aiuto su COPY\n" #: cmd.rc:46 +#, fuzzy msgid "CTTY changes the input/output device.\n" msgstr "Aiuto su CTTY\n" #: cmd.rc:47 +#, fuzzy msgid "DATE shows or changes the system date.\n" msgstr "Aiuto su DATE\n" #: cmd.rc:48 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" msgstr "Aiuto su DEL\n" #: cmd.rc:49 +#, fuzzy msgid "DIR lists the contents of a directory.\n" msgstr "Aiuto su DIR\n" @@ -8159,6 +8166,7 @@ msgstr "" "precedendolo con un segno @.\n" #: cmd.rc:61 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "Aiuto su ERASE\n" @@ -8206,6 +8214,7 @@ msgstr "" "GOTO non ha effetto quando usato in modalità interattiva.\n" #: cmd.rc:84 +#, fuzzy msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" @@ -8248,10 +8257,12 @@ msgstr "" "Puoi mostrare l'etichetta di volume del disco con il comando VOL.\n" #: cmd.rc:103 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "Aiuto su MD\n" #: cmd.rc:104 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" msgstr "Aiuto su MKDIR\n" @@ -8367,6 +8378,7 @@ msgstr "" "batch.\n" #: cmd.rc:156 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "Aiuto su REN\n" @@ -8376,10 +8388,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "Aiuto su RENAME\n" #: cmd.rc:159 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgstr "Aiuto su RD\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "Aiuto su RMDIR\n" @@ -8430,6 +8444,7 @@ msgstr "" "se chiamato dalla linea di comando.\n" #: cmd.rc:185 +#, fuzzy msgid "TIME sets or shows the current system time.\n" msgstr "Aiuto su TIME\n" @@ -8473,6 +8488,7 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER mostra la versione di cmd che stai usando\n" #: cmd.rc:205 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" msgstr "Aiuto su VOL\n"

1 0

Andrew Talbot : d3dx9_36: Eliminate comparisons of unsigned values about zero.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 22beb872f2565cbfbea39685505d45074a1a804d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22beb872f2565cbfbea396855… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 9 22:12:43 2011 +0100 d3dx9_36: Eliminate comparisons of unsigned values about zero. --- dlls/d3dx9_36/mesh.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index c6317c8..760931c 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -638,7 +638,7 @@ static HRESULT propagate_face_vertices(CONST DWORD *adjacency, DWORD *point_reps { DWORD adj_face = adjacency[face_base + edge]; DWORD adj_face_base; - DWORD i,j; + DWORD i; if (adj_face == -1) /* No adjacent face. */ continue; else if (adj_face >= numfaces) @@ -659,9 +659,9 @@ static HRESULT propagate_face_vertices(CONST DWORD *adjacency, DWORD *point_reps } /* Replaces vertices in opposite edge with vertices from current edge. */ - for (i = 0, j = 1; i < 2 && (j+1) > 0; i++, j--) + for (i = 0; i < 2; i++) { - DWORD from = face_base + (edge + j) % VERTS_PER_FACE; + DWORD from = face_base + (edge + (1 - i)) % VERTS_PER_FACE; DWORD to = adj_face_base + (opp_edge + i) % VERTS_PER_FACE; /* Propagate lowest index. */ @@ -759,9 +759,11 @@ static HRESULT WINAPI ID3DXMeshImpl_ConvertAdjacencyToPointReps(ID3DXMesh *iface if (FAILED(hr)) goto cleanup; } /* Go in opposite direction to catch all face orderings */ - for (face = This->numfaces - 1; face + 1 > 0; face--) + for (face = 0; face < This->numfaces; face++) { - hr = propagate_face_vertices(adjacency, point_reps, indices, new_indices, face, This->numfaces); + hr = propagate_face_vertices(adjacency, point_reps, + indices, new_indices, + (This->numfaces - 1) - face, This->numfaces); if (FAILED(hr)) goto cleanup; }

1 0

Andrew Talbot : krnl386.exe16: Constify some variables.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: f0a7bc130815ac01b9bc219a8b67abc4909d1e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a7bc130815ac01b9bc219a8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 9 22:12:50 2011 +0100 krnl386.exe16: Constify some variables. --- dlls/krnl386.exe16/ne_module.c | 14 ++++++++------ dlls/krnl386.exe16/snoop.c | 11 ++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 95dcab8..2fd367a 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -963,8 +963,8 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ NE_MODULE *pModule; const IMAGE_DOS_HEADER *descr = NULL; const char *file_name = NULL; - char dllname[32], *p; - const char *basename, *main_module; + char dllname[32]; + const char *basename, *main_module, *p; /* strip path information */ @@ -975,12 +975,14 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ if (strlen(basename) < sizeof(dllname)-6) { + char *q; + strcpy( dllname, basename ); - p = strrchr( dllname, '.' ); - if (!p) strcat( dllname, ".dll" ); - for (p = dllname; *p; p++) if (*p >= 'A' && *p <= 'Z') *p += 32; + q = strrchr( dllname, '.' ); + if (!q) strcat( dllname, ".dll" ); + for (q = dllname; *q; q++) if (*q >= 'A' && *q <= 'Z') *q += 32; - strcpy( p, "16" ); + strcpy( q, "16" ); if ((mod32 = LoadLibraryA( dllname ))) { if (!(descr = (void *)GetProcAddress( mod32, "__wine_spec_dos_header" ))) diff --git a/dlls/krnl386.exe16/snoop.c b/dlls/krnl386.exe16/snoop.c index 4b8477c..cef0fda 100644 --- a/dlls/krnl386.exe16/snoop.c +++ b/dlls/krnl386.exe16/snoop.c @@ -99,7 +99,8 @@ static HANDLE16 xsnr = 0; void SNOOP16_RegisterDLL(HMODULE16 hModule,LPCSTR name) { SNOOP16_DLL **dll = &(firstdll); - char *s; + const char *p; + char *q; if (!TRACE_ON(snoop)) return; @@ -146,11 +147,11 @@ SNOOP16_RegisterDLL(HMODULE16 hModule,LPCSTR name) { (*dll)->next = NULL; (*dll)->hmod = hModule; - if ((s=strrchr(name,'\\'))) - name = s+1; + if ((p=strrchr(name,'\\'))) + name = p+1; strcpy( (*dll)->name, name ); - if ((s=strrchr((*dll)->name,'.'))) - *s='\0'; + if ((q=strrchr((*dll)->name,'.'))) + *q='\0'; (*dll)->funhandle = GlobalHandleToSel16(GLOBAL_Alloc(GMEM_ZEROINIT,65535,0,WINE_LDT_FLAGS_CODE)); (*dll)->funs = GlobalLock16((*dll)->funhandle); if (!(*dll)->funs) {

1 0

Andrew Talbot : openal32: Avoid forward declarations of static arrays.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 42207504a29dfc42ef1ed6688e54aaa85d4f2563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42207504a29dfc42ef1ed6688… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 9 22:12:55 2011 +0100 openal32: Avoid forward declarations of static arrays. --- dlls/openal32/openal.c | 95 ++++++++++++++++++++++++------------------------ 1 files changed, 48 insertions(+), 47 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 6a8e8f1..ec4149c 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -79,13 +79,8 @@ static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotfv)(ALuint sid, ALenum param, static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSloti)(ALuint sid, ALenum param, ALint* value); static ALvoid (AL_APIENTRY*alGetAuxiliaryEffectSlotiv)(ALuint sid, ALenum param, ALint* values); -struct FuncList { - const char *name; - void *proc; -}; - -static const struct FuncList ALCFuncs[]; -static const struct FuncList ALFuncs[]; +extern ALCvoid* CDECL wine_alcGetProcAddress(ALCdevice *, const ALCchar *); +extern ALvoid* CDECL wine_alGetProcAddress(const ALchar*); static CRITICAL_SECTION openal_cs; static CRITICAL_SECTION_DEBUG openal_cs_debug = @@ -238,25 +233,6 @@ ALCboolean CDECL wine_alcIsExtensionPresent(ALCdevice *device, const ALCchar *ex return alcIsExtensionPresent(device, extname); } -ALCvoid* CDECL wine_alcGetProcAddress(ALCdevice *device, const ALCchar *funcname) -{ - void *proc; - int i; - - /* Make sure the host implementation has the requested function */ - proc = alcGetProcAddress(device, funcname); - if(!proc) - return NULL; - - for(i = 0;ALCFuncs[i].name;i++) - { - if(strcmp(funcname, ALCFuncs[i].name) == 0) - return ALCFuncs[i].proc; - } - FIXME("Could not find function in list: %s\n", funcname); - return NULL; -} - ALCenum CDECL wine_alcGetEnumValue(ALCdevice *device, const ALCchar *enumname) { return alcGetEnumValue(device, enumname); @@ -344,27 +320,6 @@ ALboolean CDECL wine_alIsExtensionPresent(const ALchar* extname) return alIsExtensionPresent(extname); } -ALvoid* CDECL wine_alGetProcAddress(const ALchar* funcname) -{ - void *proc; - int i; - - /* Make sure the host implementation has the requested function. This will - * also set the last AL error properly if the function should not be - * returned (eg. no current context). */ - proc = alGetProcAddress(funcname); - if(!proc) - return NULL; - - for(i = 0;ALFuncs[i].name;i++) - { - if(strcmp(funcname, ALFuncs[i].name) == 0) - return ALFuncs[i].proc; - } - FIXME("Could not find function in list: %s\n", funcname); - return NULL; -} - ALenum CDECL wine_alGetEnumValue(const ALchar* ename) { return alGetEnumValue(ename); @@ -883,6 +838,10 @@ static ALCcontext* CDECL wine_alcGetThreadContext(ALCvoid) return alcGetThreadContext(); } +struct FuncList { + const char *name; + void *proc; +}; static const struct FuncList ALCFuncs[] = { { "alcCreateContext", wine_alcCreateContext }, @@ -1023,3 +982,45 @@ static const struct FuncList ALFuncs[] = { { NULL, NULL } }; + + +ALCvoid* CDECL wine_alcGetProcAddress(ALCdevice *device, const ALCchar *funcname) +{ + void *proc; + int i; + + /* Make sure the host implementation has the requested function */ + proc = alcGetProcAddress(device, funcname); + if(!proc) + return NULL; + + for(i = 0;ALCFuncs[i].name;i++) + { + if(strcmp(funcname, ALCFuncs[i].name) == 0) + return ALCFuncs[i].proc; + } + FIXME("Could not find function in list: %s\n", funcname); + return NULL; +} + + +ALvoid* CDECL wine_alGetProcAddress(const ALchar* funcname) +{ + void *proc; + int i; + + /* Make sure the host implementation has the requested function. This will + * also set the last AL error properly if the function should not be + * returned (eg. no current context). */ + proc = alGetProcAddress(funcname); + if(!proc) + return NULL; + + for(i = 0;ALFuncs[i].name;i++) + { + if(strcmp(funcname, ALFuncs[i].name) == 0) + return ALFuncs[i].proc; + } + FIXME("Could not find function in list: %s\n", funcname); + return NULL; +}

1 0

Josh Juran : gdi32: Simplify logic in WineEngGetFontData().
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: b27e814de6fe9e784a851fe1ed7cfa934a591c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27e814de6fe9e784a851fe1e… Author: Josh Juran <josh(a)iswifter.net> Date: Fri Sep 9 14:19:12 2011 -0700 gdi32: Simplify logic in WineEngGetFontData(). --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 716a37f..d71b0c5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6198,7 +6198,7 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, if(!FT_IS_SFNT(ft_face)) return GDI_ERROR; - if(!buf || !cbData) + if(!buf) len = 0; else len = cbData;

1 0

Marcus Meissner : user32: Fixed single byte array overflow.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: d177a97d287221a26987049ae29cf6e40c80cd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d177a97d287221a26987049ae… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Sep 10 00:40:07 2011 +0200 user32: Fixed single byte array overflow. --- dlls/user32/wsprintf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index fe20536..5e618d6 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -316,7 +316,7 @@ static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list arg WPRINTF_FORMAT format; LPSTR p = buffer; UINT i, len, sign; - CHAR number[20]; + CHAR number[21]; /* 64bit number can be 18446744073709551616 which is 20 chars. and a \0 */ WPRINTF_DATA argData; TRACE("%p %u %s\n", buffer, maxlen, debugstr_a(spec)); @@ -421,7 +421,7 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a WPRINTF_FORMAT format; LPWSTR p = buffer; UINT i, len, sign; - CHAR number[20]; + CHAR number[21]; /* 64bit number can be 18446744073709551616 which is 20 chars. and a \0 */ WPRINTF_DATA argData; TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec));

1 0